Commit 09ade15b authored by Philipp Schafft's avatar Philipp Schafft 🦁

Merge branch 'update-conf'

parents de6e8b41 1fd17b0b
Pipeline #328 failed with stage
in 12 seconds
## Process this with automake to create Makefile.in
EXTRA_DIST = icecast.xml.in icecast_minimal.xml.in icecast_shoutcast_compat.xml.in icecast_urlauth.xml.in
DISTCLEANFILES = icecast.xml.dist icecast_minimal.xml.dist icecast_shoutcast_compat.xml.dist icecast_urlauth.xml.dist
EXTRA_DIST = icecast.xml.in icecast_minimal.xml.in icecast_shoutcast_compat.xml.in
DISTCLEANFILES = icecast.xml.dist icecast_minimal.xml.dist icecast_shoutcast_compat.xml.dist
docdir = $(datadir)/$(PACKAGE)/doc
doc_DATA = icecast.xml.dist icecast_minimal.xml.dist icecast_shoutcast_compat.xml.dist icecast_urlauth.xml.dist
doc_DATA = icecast.xml.dist icecast_minimal.xml.dist icecast_shoutcast_compat.xml.dist
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
......@@ -24,9 +24,6 @@ icecast_minimal.xml.dist: $(srcdir)/icecast_minimal.xml.in
icecast_shoutcast_compat.xml.dist: $(srcdir)/icecast_shoutcast_compat.xml.in
$(edit) $(srcdir)/icecast_shoutcast_compat.xml.in > icecast_shoutcast_compat.xml.dist
icecast_urlauth.xml.dist: $(srcdir)/icecast_urlauth.xml.in
$(edit) $(srcdir)/icecast_urlauth.xml.in > icecast_urlauth.xml.dist
debug:
$(MAKE) all CFLAGS="@DEBUG@"
......
......@@ -7,28 +7,33 @@
-->
<!-- location and admin are two strings that are e.g. visible
on the server info page of the icecast web interface -->
on the server info page of the icecast web interface -->
<location>Earth</location>
<!-- If you are listing streams on a YP, this MUST be a working email! -->
<admin>icemaster@localhost</admin>
<!-- 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. You MUST configure it properly for YP listings to work!
This is NOT your homepage address, it's the hostname for THIS server.
-->
<hostname>localhost</hostname>
<limits>
<!-- Global maximum number of clients.
This includes all kinds of clients, not only listeners.
-->
<clients>100</clients>
<sources>2</sources>
<queue-size>524288</queue-size>
<client-timeout>30</client-timeout>
<header-timeout>15</header-timeout>
<source-timeout>10</source-timeout>
<!-- If enabled, this will provide a burst of data when a client
first connects, thereby significantly reducing the startup
time for listeners that do substantial buffering. However,
it also significantly increases latency between the source
client and listening client. For low-latency setups, you
might want to disable this. -->
<burst-on-connect>1</burst-on-connect>
<!-- same as burst-on-connect, but this allows for being more
specific on how much to burst. Most people won't need to
change from the default 64k. Applies to all mountpoints -->
<!-- This sets the burst size in [bytes]. This is the amount the
the server sends to a listener that connects to a stream.
This allows for a significantly reducing in startup time.
Most people won't need to change from the default 64k.
Applies to all mountpoints.
-->
<burst-size>65535</burst-size>
</limits>
......@@ -49,7 +54,7 @@
-->
<!-- Uncommenting this enables publishing to the streaming directory at:
http://dir.xiph.org/
http://dir.xiph.org/
Please read the Icecast documentation about publishing to directories
very carefully, as it is not enough to just uncomment this.
-->
......@@ -60,13 +65,6 @@
</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. You MUST configure it properly for YP listings to work!
This is NOT your homepage address, it's the hostname for THIS server.
-->
<hostname>localhost</hostname>
<!-- You may have multiple <listen-socket> elements -->
<listen-socket>
<port>8000</port>
......@@ -81,7 +79,7 @@
<!--
<listen-socket>
<port>8443</port>
<tls>1</tls>
<tls>auto_no_plain</tls>
</listen-socket>
-->
......@@ -103,45 +101,75 @@
You don't need this if you only have one server.
Please refer to the documentation 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>-->
<!--<master-password>hackme</master-password>-->
<!--
<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>-->
The default is false -->
<!--<relays-on-demand>true</relays-on-demand>-->
<!-- Basic relay with one upstream server -->
<!--
<relay>
<server>127.0.0.1</server>
<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>
<upstream type="normal">
<server>127.0.0.1</server>
<port>8080</port>
<mount>/example.ogg</mount>
<relay-shoutcast-metadata>false</relay-shoutcast-metadata>
</upstream>
</relay>
-->
<!-- Relay with multiple upstream servers and default settings -->
<!--
<relay>
<local-mount>/different.ogg</local-mount>
<on-demand>false</on-demand>
<upstream type="normal">
<server>master0.example.org</server>
</upstream>
<upstream type="normal">
<server>master1.example.org</server>
</upstream>
<upstream type="normal">
<server>master2.example.org</server>
<port>8080</port>
</upstream>
<upstream type="default">
<port>8000</port>
<mount>/example.ogg</mount>
</upstream>
</relay>
-->
<!-- Mountpoints
Only define <mount> sections if you want to use advanced options,
like alternative usernames or passwords
like alternative usernames or passwords
All <mount> sections below are disabled by default,
to activate them remove the comment markers around them and restart.
to activate them remove the comment markers around them and reload.
-->
<!-- Default settings for all mounts that don't have a specific <mount type="normal">.
-->
<!--
<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">
<option name="mount_add" value="http://auth.example.org/stream_start.php"/>
<authentication>
<role type="url" match-method="source,put" allow-web="*" allow-admin="*">
<option name="client_add" value="http://auth.example.org/stream_start.php"/>
</role>
<role type="anonymous" match-method="source,put" deny-all="*" />
</authentication>
<http-headers>
<header name="foo" value="bar" />
......@@ -154,46 +182,81 @@
<mount type="normal">
<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>
<fallback-override>true</fallback-override>
<fallback-when-full>true</fallback-when-full>
<intro>/example_intro.ogg</intro>
<hidden>1</hidden>
<public>1</public>
<authentication type="htpasswd">
<option name="filename" value="myauth"/>
<option name="allow_duplicate_users" value="0"/>
<hidden>true</hidden>
<public>true</public>
<authentication>
<role type="htpasswd" connections-per-user="1">
<option name="filename" value="myauth" />
</role>
<role type="static" allow-method="source,put,get,post,options" deny-web="*" allow-admin="*">
<option name="username" value="othersource" />
<option name="passwod" value="hackmemore" />
</role>
<role type="anonymous" deny-all="*" />
</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>
<event-bindings>
<event type="exec" trigger="source-connect">
<option name="executable" value="/home/icecast/bin/stream-start" />
</event>
<event type="exec" trigger="source-disconnect">
<option name="executable" value="/home/icecast/bin/stream-stop" />
</event>
</event-bindings>
</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"/>
<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"/>
<option name="headers" value="x-pragma,x-token"/>
<option name="header_prefix" value="ClientHeader."/>
<authentication>
<role type="url" match-method="get,post,head,options" allow-web="*" deny-admin="*" may-alter="send_error,redirect">
<option name="client_add" value="http://myauthserver.net/notify_listener.php"/>
<option name="client_remove" value="http://myauthserver.net/notify_listener.php"/>
<option name="action_add" value="listener_add"/>
<option name="action_remove" value="listener_remove"/>
<option name="headers" value="x-pragma,x-token"/>
<option name="header_prefix" value="ClientHeader."/>
</role>
<role type="anonymous" match-method="get,post,head,options" deny-all="*" />
</authentication>
<event-bindings>
<event type="url" trigger="source-connect">
<option name="url" value="http://myauthserver.net/notify_mount.php" />
<option name="action" value="mount_add" />
</event>
<event type="url" trigger="source-disconnect">
<option name="url" value="http://myauthserver.net/notify_mount.php" />
<option name="action" value="mount_remove" />
</event>
</event-bindings>
</mount>
-->
<fileserve>1</fileserve>
<!-- Relays can also go into a <mount type="normal"> section -->
<!--
<mount type="normal">
<mount-name>/relay_example.ogg</mount-name>
<relay>
<upstream type="normal">
<server>master0.example.org</server>
<port>8000</port>
<mount>/example.ogg</mount>
</upstream>
</relay>
</mount>
-->
<paths>
<!-- basedir is only used if chroot is enabled -->
......@@ -228,18 +291,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>
......
......@@ -2,7 +2,8 @@
and mostly just contains the things you need to change or are
necessary to get Icecast working for most use cases. We created
this for those who got scared away from the rather large and heavily
commented icecast.xml.dist file. -->
commented icecast.xml.dist file.
-->
<icecast>
<limits>
<sources>2</sources>
......@@ -21,7 +22,6 @@
<listen-socket>
<port>8000</port>
</listen-socket>
<fileserve>1</fileserve>
<paths>
<logdir>@localstatedir@/log/@PACKAGE@</logdir>
<webroot>@pkgdatadir@/web</webroot>
......@@ -31,7 +31,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="*" />
......
......@@ -3,7 +3,8 @@
you to connect the Shoutcast DSP (or other Nullsoft
encoders such as the NSV encoder). Note this is just
a minimal config, check the main icecast.xml.dist file
for a complete list of possible configuration options -->
for a complete list of possible configuration options
-->
<icecast>
<limits>
<sources>2</sources>
......@@ -20,8 +21,9 @@
<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.
-->
<hostname>localhost</hostname>
<!-- You MUST define 2 ports, port and port +1 -->
<listen-socket>
......@@ -31,7 +33,6 @@
<port>8000</port>
<shoutcast-mount>/stream</shoutcast-mount>
</listen-socket>
<fileserve>1</fileserve>
<paths>
<logdir>@localstatedir@/log/@PACKAGE@</logdir>
<webroot>@pkgdatadir@/web</webroot>
......@@ -40,9 +41,12 @@
<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="*" />
</http-headers>
</icecast>
<icecast>
<!-- This is a simple example of using the url authenticator. -->
<limits>
<clients>100</clients>
<sources>2</sources>
<queue-size>524288</queue-size>
<client-timeout>30</client-timeout>
<header-timeout>15</header-timeout>
<source-timeout>10</source-timeout>
<burst-size>65535</burst-size>
</limits>
<authentication>
<source-password>hackme</source-password>
<relay-password>hackme</relay-password>
<admin-user>admin</admin-user>
<admin-password>hackme</admin-password>
</authentication>
<hostname>localhost</hostname>
<listen-socket>
<port>8000</port>
</listen-socket>
<mount>
<mount-name>/auth_example.ogg</mount-name>
<authentication type="url">
<option name="mount_add" value="http://myauthserver.net/action.php"/>
<option name="mount_remove" value="http://myauthserver.net/action.php"/>
<option name="listener_add" value="http://myauthserver.net/action.php"/>
<option name="listener_remove" value="http://myauthserver.net/action.php"/>
</authentication>
</mount>
<fileserve>1</fileserve>
<paths>
<basedir>@pkgdatadir@</basedir>
<logdir>@localstatedir@/log/@PACKAGE@</logdir>
<webroot>@pkgdatadir@/web</webroot>
<adminroot>@pkgdatadir@/admin</adminroot>
<alias source="/" destination="/status.xsl"/>
</paths>
<logging>
<accesslog>access.log</accesslog>
<errorlog>error.log</errorlog>
<loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
</logging>
<security>
<chroot>0</chroot>
</security>
</icecast>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment