Changeset f2ea21fd96fc464fb4056b1027f29e543efe8df9

Timestamp:

07/27/10 14:34:42 (6 weeks ago)

Author:

Alban Peignier <alban@…>

Parents:

47dfd6383de03015167a5f85a728197b2b9a147b

Children:

69be6848e524cca23c6f317e7d818d6189846672

git-committer:

Alban Peignier <alban@tryphon.eu> / 2010-07-27T14:34:42Z+0200

Message:

Remove comment sections and increase the log level to 3/info

Files:

• files/icecast2/icecast.xml (modified) (2 diffs)

files/icecast2/icecast.xml

@@ -32 +32 @@
     </authentication>
 
-    <!-- Uncomment this if you want directory listings -->
-    <!--
-    <directory>
-        <yp-url-timeout>15</yp-url-timeout>
-        <yp-url>http://dir.xiph.org/cgi-bin/yp-cgi</yp-url>
-    </directory>
-     -->
-
-    <!-- This is the hostname other people will use to connect to your server.
-    It affects mainly the urls generated by Icecast for playlists and yp
-    listings. -->
     <hostname>localhost</hostname>
-
-    <!-- You can use these two if you only want a single listener -->
-    <!--<port>8000</port> -->
-    <!--<bind-address>127.0.0.1</bind-address>-->
-
-    <!-- You may have multiple <listener> elements -->
     <listen-socket>
         <port>8000</port>
-        <!-- <bind-address>127.0.0.1</bind-address> -->
     </listen-socket>
-    <!--
-    <listen-socket>
-        <port>8001</port>
-    </listen-socket>
-    -->
-
-    <!--<master-server>127.0.0.1</master-server>-->
-    <!--<master-server-port>8001</master-server-port>-->
-    <!--<master-update-interval>120</master-update-interval>-->
-    <!--<master-password>hackme</master-password>-->
-
-    <!-- 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>-->
-
-    <!--
-    <relay>
-        <server>127.0.0.1</server>
-        <port>8001</port>
-        <mount>/example.ogg</mount>
-        <local-mount>/different.ogg</local-mount>
-        <on-demand>0</on-demand>
-
-        <relay-shoutcast-metadata>0</relay-shoutcast-metadata>
-    </relay>
-    -->
-
-    <!-- Only define a <mount> section if you want to use advanced options,
-         like alternative usernames or passwords
-    <mount>
-        <mount-name>/example-complex.ogg</mount-name>
-
-        <username>othersource</username>
-        <password>hackmemore</password>
-
-        <max-listeners>1</max-listeners>
-        <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>
-        <intro>/example_intro.ogg</intro>
-        <hidden>1</hidden>
-        <no-yp>1</no-yp>
-        <authentication type="htpasswd">
-                <option name="filename" value="myauth"/>
-                <option name="allow_duplicate_users" value="0"/>
-        </authentication>
-        <on-connect>/home/icecast/bin/stream-start</on-connect>
-        <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
-    </mount>
-
-    <mount>
-        <mount-name>/auth_example.ogg</mount-name>
-        <authentication type="url">
-            <option name="mount_add"       value="http://myauthserver.net/notify_mount.php"/>
-            <option name="mount_remove"    value="http://myauthserver.net/notify_mount.php"/>
-            <option name="listener_add"    value="http://myauthserver.net/notify_listener.php"/>
-            <option name="listener_remove" value="http://myauthserver.net/notify_listener.php"/>
-        </authentication>
-    </mount>
-
-    -->
 
     <fileserve>1</fileserve>
 
-    <!-- set the mountpoint for a shoutcast source to use, the default if not
-         specified is /stream but you can change it here if an alternative is
-         wanted or an extension is required
-    <shoutcast-mount>/live.nsv</shoutcast-mount>
-    -->
-
     <paths>
-                <!-- basedir is only used if chroot is enabled -->
         <basedir>/usr/share/icecast2</basedir>
-
-        <!-- Note that if <chroot> is turned on below, these paths must both
-             be relative to the new root, not the original root -->
-        <logdir>/var/log</logdir>
+        <logdir>/var/log/icecast2</logdir>
         <webroot>/usr/share/icecast2/web</webroot>
         <adminroot>/usr/share/icecast2/admin</adminroot>
-        <!-- <pidfile>/usr/share/icecast2/icecast.pid</pidfile> -->
-
-        <!-- Aliases: treat requests for 'source' path as being for 'dest' path
-             May be made specific to a port or bound address using the "port"
-             and "bind-address" attributes.
-          -->
-        <!--
-        <alias source="/foo" dest="/bar"/>
-          -->
-        <!-- Aliases: can also be used for simple redirections as well,
-             this example will redirect all requests for http://server:port/ to
-             the status page
-          -->
         <alias source="/" dest="/status.xsl"/>
     </paths>
@@ -156 +51 @@
         <errorlog>error.log</errorlog>
         <!-- <playlistlog>playlist.log</playlistlog> -->
-        <loglevel>2</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 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> -->
+        <loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
     </logging>
 
     <security>
         <chroot>0</chroot>
-        <!--
-        <changeowner>
-            <user>nobody</user>
-            <group>nogroup</group>
-        </changeowner>
-        -->
     </security>
 </icecast>