From 58fdef4856859b901d04d1c8af024db1f70ca17d Mon Sep 17 00:00:00 2001
From: "Thomas B. \"dm8tbr\" Ruecker" <thomas@ruecker.fi>
Date: Mon, 10 Nov 2014 06:25:15 +0000
Subject: [PATCH] Update default config, SSL, headers, default-mount

svn path=/icecast/trunk/icecast/; revision=19297
---
 conf/icecast.xml.in | 83 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 71 insertions(+), 12 deletions(-)

diff --git a/conf/icecast.xml.in b/conf/icecast.xml.in
index 7ce5866f..c6cb9c84 100644
--- a/conf/icecast.xml.in
+++ b/conf/icecast.xml.in
@@ -5,6 +5,13 @@
     <location>Earth</location>
     <admin>icemaster@localhost</admin>
 
+    <!-- IMPORTANT!
+	 Especially for inexperienced users:
+	 Start out by ONLY changing all passwords and restarting Icecast.
+         For detailed setup instructions please refer to the documentation.
+         It's also available here: http://icecast.org/docs/
+    -->
+
     <limits>
         <clients>100</clients>
         <sources>2</sources>
@@ -28,7 +35,7 @@
     <authentication>
         <!-- Sources log in with username 'source' -->
         <source-password>hackme</source-password>
-        <!-- Relays log in username 'relay' -->
+        <!-- Relays log in with username 'relay' -->
         <relay-password>hackme</relay-password>
 
         <!-- Admin logs in with the username given below -->
@@ -48,11 +55,12 @@
         <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. -->
+         It affects mainly the urls generated by Icecast for playlists and yp
+         listings. You MUST configure it properly for YP listings to work!
+    -->
     <hostname>localhost</hostname>
 
     <!-- You may have multiple <listener> elements -->
@@ -63,10 +71,34 @@
     </listen-socket>
     <!--
     <listen-socket>
-        <port>8001</port>
+        <port>8080</port>
+    </listen-socket>
+    -->
+    <!--
+    <listen-socket>
+        <port>8443</port>
+        <ssl>1</ssl>
     </listen-socket>
     -->
 
+
+    <!-- Global header settings 
+         Headers defined here will be returned for every HTTP request to Icecast.
+    -->
+    <http-headers>
+        <!-- Make Icecast public content/API by default
+             This will make streams easier embeddable (some HTML5 functionality needs it).
+             Also it allows direct access to e.g. /status-json.xsl from other sites.
+             If you don't want this, comment out the following line or read up on CORS.
+	-->    
+        <header name="Access-Control-Allow-Origin" value="*" />
+    </http-headers>
+
+
+    <!-- Relaying
+         You don't need this if you only have one server.
+         Please refer to the config for a detailed explanation.
+    -->
     <!--<master-server>127.0.0.1</master-server>-->
     <!--<master-server-port>8001</master-server-port>-->
     <!--<master-update-interval>120</master-update-interval>-->
@@ -80,7 +112,7 @@
     <!--
     <relay>
         <server>127.0.0.1</server>
-        <port>8001</port>
+        <port>8080</port>
         <mount>/example.ogg</mount>
         <local-mount>/different.ogg</local-mount>
         <on-demand>0</on-demand>
@@ -89,12 +121,31 @@
     </relay>
     -->
 
-    <!-- Only define a <mount> section if you want to use advanced options,
+
+    <!-- Mountpoints
+         Only define <mount> sections if you want to use advanced options,
 	 like alternative usernames or passwords
     -->
 
+    <!-- Default settings for all mounts that don't have a specific <mount type="normal">.
+    -->
+    <!-- 
+    <mount type="default">
+        <public>0</public>
+	<intro>/server-wide-intro.ogg</intro>
+        <max-listener-duration>3600</max-listener-duration>
+	<authentication type="url">
+                <option name="mount_add" value="http://auth.example.org/stream_start.php"/>
+	</authentication>
+        <http-headers>
+                <header name="foo" value="bar" />
+	</http-headers>
+    </mount>
+    -->
+
+    <!-- Normal mounts -->
     <!--
-    <mount>
+    <mount type="normal">
         <mount-name>/example-complex.ogg</mount-name>
 
         <username>othersource</username>
@@ -108,18 +159,22 @@
         <fallback-when-full>1</fallback-when-full>
         <intro>/example_intro.ogg</intro>
         <hidden>1</hidden>
-        <no-yp>1</no-yp>
+        <public>1</public>
         <authentication type="htpasswd">
                 <option name="filename" value="myauth"/>
                 <option name="allow_duplicate_users" value="0"/>
         </authentication>
+        <http-headers>
+		<header name="Access-Control-Allow-Origin" value="http://webplayer.example.org" />
+                <header name="baz" value="quux" />
+	</http-headers>
         <on-connect>/home/icecast/bin/stream-start</on-connect>
         <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
     </mount>
     -->
 
     <!--
-    <mount>
+    <mount type="normal">
         <mount-name>/auth_example.ogg</mount-name>
         <authentication type="url">
             <option name="mount_add"       value="http://myauthserver.net/notify_mount.php"/>
@@ -151,12 +206,16 @@
           -->
         <!--
         <alias source="/foo" destination="/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="/" destination="/status.xsl"/>
+	<!-- The certificate file needs to contain both public and private part.
+             Both should be PEM encoded.
+	<ssl-certificate>@pkgdatadir@/icecast.pem</ssl-certificate>
+        -->
     </paths>
 
     <logging>