[xiph-cvs] cvs commit: icecast/web Makefile.am
Brendan
brendan at xiph.org
Tue Jun 17 14:10:56 PDT 2003
brendan 03/06/17 17:10:56
Modified: . Makefile.am
admin Makefile.am
conf Makefile.am
web Makefile.am
Added: . NEWS
conf icecast.xml.in
Removed: conf icecast.xml
Log:
Fix critical TODO item 1 (make install)
ATTN Mike!
make install now installs the xsl files in pkgdatadir ($prefix/share/icecast) web
and admin directories, and builds icecast.xml accordingly. icecast.xml is now
installed in $sysconfdir/etc, and IMHO icecast should attempt to find a config
file there, and only demand one on the command line if it can't.
Revision Changes Path
1.6 +3 -3 icecast/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -u -r1.5 -r1.6
--- Makefile.am 15 May 2003 21:04:39 -0000 1.5
+++ Makefile.am 17 Jun 2003 21:10:55 -0000 1.6
@@ -4,10 +4,10 @@ AUTOMAKE_OPTIONS = foreign dist-zip
SUBDIRS = src conf doc web admin win32
-EXTRA_DIST = README AUTHORS COPYING
+EXTRA_DIST = HACKING
-# SCCS Definitions (for BitKeeper)
-GET = true
+docdir = $(datadir)/doc/$(PACKAGE)
+doc_DATA = README AUTHORS COPYING NEWS TODO
debug:
$(MAKE) all CFLAGS="@DEBUG@ @XML_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@"
<p><p>1.1 icecast/NEWS
Index: NEWS
===================================================================
2003-04-23
Support aliases
2003-03-09
Support listening on multiple sockets.
2003-03-08
Support for shoutcast source protocol added.
2003-03-08
Started implementing generic admin interface. Supports (so far):
- dynamic configuration of mount fallbacks
/admin/fallbacks?mount=/mount&fallback=/fallback
- setting of mp3 metadata
/admin/metadata?mount=/mount&mode=updinfo&song=New%20Title
- dumping raw xml stats
/admin/rawstats
- listing all connected clients on a mountpoint:
/admin/listclients?mount=/mountname
2003-03-05
Implemented the ability to reread the config file on SIGHUP. For now, this
does not affect configuration for currently running sources (only new
sources and global parameters like max-listeners)
2003-03-02
More features:
-- per mountpoint listener maxima
-- static configuration of mountpoint fallbacks
-- stream dumping (write incoming stream to disk)
2003-02-27
Fix log buffering on win32 - previously, logs were never flushed, so they
only got output every few tens or hundreds of lines.
2003-02-27
Support new icy-audio-info header, to communicate various parameters to
clients and yp servers, including sample rate, quality, channels, bitrate
2003-02-25
Full support for relaying mp3 metadata (if turned on in config file)
2003-02-25
Allow configuration of maximum client queue length (in bytes)
2003-02-14
Finished full IPv6 support.
2003-02-12
Allow configuring local mountpoint seperately from remote mountpoint for
relays
2003-02-12
Per mountpoint usernames and passwords (for sources)
2003-02-11
Now that it's been officially assigned, use application/ogg instead of
application/x-ogg
2003-02-07
Allow relaying of mp3 streams from icecast 1.x and shoutcast
2003-02-07
Added ability to configure individual relays (rather than just all streams
from a single server).
2003-02-03
Added support for YP directory services listings
are only used by the yp listing routines
2003-02-03
Support command line parameter -b to run in the background (not supported
on win32)
2002-12-31
Implement configurable mountpoint fallbacks (on source exit, clients are
transferred to another mountpoint automatically, without disconnecting
them)
2002-12-31
Implemented full mp3 metadata support.
(older stuff is missing from here)
<p><p><p>1.2 +3 -1 icecast/admin/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/admin/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -u -r1.1 -r1.2
--- Makefile.am 15 May 2003 21:01:30 -0000 1.1
+++ Makefile.am 17 Jun 2003 21:10:55 -0000 1.2
@@ -2,5 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = listclients.xsl listmounts.xsl moveclients.xsl response.xsl stats.xsl
+admindir = $(pkgdatadir)/admin
+dist_admin_DATA = listclients.xsl listmounts.xsl moveclients.xsl response.xsl \
+ stats.xsl
<p><p>1.3 +10 -1 icecast/conf/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/conf/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -u -r1.2 -r1.3
--- Makefile.am 9 Aug 2002 15:55:01 -0000 1.2
+++ Makefile.am 17 Jun 2003 21:10:56 -0000 1.3
@@ -2,7 +2,16 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = icecast.xml
+EXTRA_DIST = icecast.xml.in
+
+sysconf_DATA = icecast.xml
+
+edit = sed -e 's, at pkgdatadir\@,$(pkgdatadir),g' \
+ -e 's, at localstatedir\@,$(localstatedir),g' \
+ -e 's, at PACKAGE\@,$(PACKAGE),g'
+
+icecast.xml: $(srcdir)/icecast.xml.in
+ $(edit) $(srcdir)/icecast.xml.in > icecast.xml
debug:
$(MAKE) all CFLAGS="@DEBUG@"
<p><p>1.1 icecast/conf/icecast.xml.in
Index: icecast.xml.in
===================================================================
<icecast>
<location>Not Currently Used</location>
<admin>Not Currently Used</admin>
<limits>
<clients>100</clients>
<sources>2</sources>
<threadpool>5</threadpool>
<queue-size>102400</queue-size>
<client-timeout>30</client-timeout>
<header-timeout>15</header-timeout>
<source-timeout>10</source-timeout>
</limits>
<authentication>
<!-- Sources log in with username 'source' -->
<source-password>hackme</source-password>
<!-- Relays log in username 'relay' -->
<relay-password>hackme</relay-password>
<!-- Admin logs in with the username given below -->
<admin-user>admin</admin-user>
<admin-password>hackme</admin-password>
</authentication>
<!-- Uncomment this if you want directory listings -->
<!--
<directory>
<yp-url-timeout>15</yp-url-timeout>
<yp-url><a href="http://www.oddsock.org/cgi-bin/yp-cgi</yp-url">http://www.oddsock.org/cgi-bin/yp-cgi</yp-url</a>>
</directory>
<directory>
<yp-url-timeout>15</yp-url-timeout>
<yp-url><a href="http://yp.icecast.net/cgi-bin/yp.cgi</yp-url">http://yp.icecast.net/cgi-bin/yp.cgi</yp-url</a>>
</directory>
-->
<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>-->
<!--
<relay>
<server>127.0.0.1</server>
<port>8001</port>
<mount>/example.ogg</mount>
<local-mount>/different.ogg</local-mount>
<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> -->
<fallback-mount>/example2.ogg</fallback-mount>
</mount>
<fileserve>1</fileserve>
<paths>
<basedir>@pkgdatadir@</basedir>
<!-- Note that if <chroot> is turned on below, these paths must both
be relative to the new root, not the original root -->
<logdir>@localstatedir@/@PACKAGE@/logs</logdir>
<webroot>@pkgdatadir@/web</webroot>
<adminroot>@pkgdatadir@/admin</adminroot>
<!-- 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"/>
-->
</paths>
<logging>
<accesslog>access.log</accesslog>
<errorlog>error.log</errorlog>
<loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
</logging>
<security>
<chroot>0</chroot>
<!--
<changeowner>
<user>nobody</user>
<group>nogroup</group>
</changeowner>
-->
</security>
</icecast>
<p><p>1.2 +2 -1 icecast/web/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/icecast/web/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -u -r1.1 -r1.2
--- Makefile.am 24 Sep 2002 08:16:24 -0000 1.1
+++ Makefile.am 17 Jun 2003 21:10:56 -0000 1.2
@@ -2,5 +2,6 @@
AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = status.xsl status2.xsl
+webdir = $(pkgdatadir)/web
+dist_web_DATA = status.xsl status2.xsl
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list