From f0df5ae488ca4236728909ff6112393db53f921b Mon Sep 17 00:00:00 2001
From: Philipp Schafft <lion@lion.leolix.org>
Date: Fri, 28 Sep 2018 10:59:09 +0000
Subject: [PATCH] Update: Use symbolic values where possible

---
 conf/icecast.xml.in                  | 30 ++++++++++++++--------------
 conf/icecast_minimal.xml.in          |  4 ++--
 conf/icecast_shoutcast_compat.xml.in |  6 +++---
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/conf/icecast.xml.in b/conf/icecast.xml.in
index 14229551..370b7042 100644
--- a/conf/icecast.xml.in
+++ b/conf/icecast.xml.in
@@ -79,7 +79,7 @@
     <!--
     <listen-socket>
         <port>8443</port>
-        <tls>1</tls>
+        <tls>auto_no_plain</tls>
     </listen-socket>
     -->
 
@@ -110,8 +110,8 @@
 
     <!-- Setting this makes all relays on-demand unless overridden, this is
          useful for master relays which do not have <relay> definitions here.
-         The default is 0 -->
-    <!--<relays-on-demand>1</relays-on-demand>-->
+         The default is false -->
+    <!--<relays-on-demand>true</relays-on-demand>-->
 
     <!--
     <relay>
@@ -119,9 +119,9 @@
         <port>8080</port>
         <mount>/example.ogg</mount>
         <local-mount>/different.ogg</local-mount>
-        <on-demand>0</on-demand>
+        <on-demand>false</on-demand>
 
-        <relay-shoutcast-metadata>0</relay-shoutcast-metadata>
+        <relay-shoutcast-metadata>false</relay-shoutcast-metadata>
     </relay>
     -->
 
@@ -137,7 +137,7 @@
     -->
     <!--
     <mount type="default">
-        <public>0</public>
+        <public>false</public>
         <intro>/server-wide-intro.ogg</intro>
         <max-listener-duration>3600</max-listener-duration>
         <authentication type="url">
@@ -161,14 +161,14 @@
         <dump-file>/tmp/dump-example1.ogg</dump-file>
         <burst-size>65536</burst-size>
         <fallback-mount>/example2.ogg</fallback-mount>
-        <fallback-override>1</fallback-override>
-        <fallback-when-full>1</fallback-when-full>
+        <fallback-override>true</fallback-override>
+        <fallback-when-full>true</fallback-when-full>
         <intro>/example_intro.ogg</intro>
-        <hidden>1</hidden>
-        <public>1</public>
+        <hidden>true</hidden>
+        <public>true</public>
         <authentication type="htpasswd">
                 <option name="filename" value="myauth"/>
-                <option name="allow_duplicate_users" value="0"/>
+                <option name="allow_duplicate_users" value="false"/>
         </authentication>
         <http-headers>
                 <header name="Access-Control-Allow-Origin" value="http://webplayer.example.org" />
@@ -193,7 +193,7 @@
     </mount>
     -->
 
-    <fileserve>1</fileserve>
+    <fileserve>true</fileserve>
 
     <paths>
         <!-- basedir is only used if chroot is enabled -->
@@ -228,18 +228,18 @@
         <accesslog>access.log</accesslog>
         <errorlog>error.log</errorlog>
         <!-- <playlistlog>playlist.log</playlistlog> -->
-        <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+        <loglevel>information</loglevel> <!-- "debug", "information", "warning", or "error" -->
         <logsize>10000</logsize> <!-- Max size of a logfile -->
         <!-- If logarchive is enabled (1), then when logsize is reached
              the logfile will be moved to [error|access|playlist].log.DATESTAMP,
              otherwise it will be moved to [error|access|playlist].log.old.
              Default is non-archive mode (i.e. overwrite)
         -->
-        <!-- <logarchive>1</logarchive> -->
+        <!-- <logarchive>true</logarchive> -->
     </logging>
 
     <security>
-        <chroot>0</chroot>
+        <chroot>false</chroot>
         <!--
         <changeowner>
             <user>nobody</user>
diff --git a/conf/icecast_minimal.xml.in b/conf/icecast_minimal.xml.in
index 0c9d21c7..66b4a785 100644
--- a/conf/icecast_minimal.xml.in
+++ b/conf/icecast_minimal.xml.in
@@ -22,7 +22,7 @@
     <listen-socket>
         <port>8000</port>
     </listen-socket>
-    <fileserve>1</fileserve>
+    <fileserve>true</fileserve>
     <paths>
         <logdir>@localstatedir@/log/@PACKAGE@</logdir>
         <webroot>@pkgdatadir@/web</webroot>
@@ -32,7 +32,7 @@
     <logging>
         <accesslog>access.log</accesslog>
         <errorlog>error.log</errorlog>
-        <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+        <loglevel>information</loglevel> <!-- "debug", "information", "warning", or "error" -->
     </logging>
     <http-headers>
         <header name="Access-Control-Allow-Origin" value="*" />
diff --git a/conf/icecast_shoutcast_compat.xml.in b/conf/icecast_shoutcast_compat.xml.in
index 15d7972e..fa6ed353 100644
--- a/conf/icecast_shoutcast_compat.xml.in
+++ b/conf/icecast_shoutcast_compat.xml.in
@@ -33,7 +33,7 @@
         <port>8000</port>
         <shoutcast-mount>/stream</shoutcast-mount>
     </listen-socket>
-    <fileserve>1</fileserve>
+    <fileserve>true</fileserve>
     <paths>
         <logdir>@localstatedir@/log/@PACKAGE@</logdir>
         <webroot>@pkgdatadir@/web</webroot>
@@ -42,10 +42,10 @@
     <logging>
         <accesslog>access.log</accesslog>
         <errorlog>error.log</errorlog>
-        <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+        <loglevel>information</loglevel> <!-- "debug", "information", "warning", or "error" -->
     </logging>
     <security>
-        <chroot>0</chroot>
+        <chroot>false</chroot>
     </security>
     <http-headers>
         <header name="Access-Control-Allow-Origin" value="*" />