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@"
......
This diff is collapsed.
......@@ -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