From e19a7af1b125b488c72e3bb87cfdcce665867ee2 Mon Sep 17 00:00:00 2001 From: brendan Date: Tue, 17 Jun 2003 21:10:56 +0000 Subject: [PATCH] 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. svn path=/trunk/icecast/; revision=4956 --- Makefile.am | 6 +- NEWS | 84 ++++++++++++++++++++++++++++ admin/Makefile.am | 4 +- conf/Makefile.am | 11 +++- conf/{icecast.xml => icecast.xml.in} | 8 +-- web/Makefile.am | 3 +- 6 files changed, 106 insertions(+), 10 deletions(-) create mode 100644 NEWS rename conf/{icecast.xml => icecast.xml.in} (94%) diff --git a/Makefile.am b/Makefile.am index 1acd4ad2..8e3b7290 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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@" diff --git a/NEWS b/NEWS new file mode 100644 index 00000000..629c8801 --- /dev/null +++ b/NEWS @@ -0,0 +1,84 @@ +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) + diff --git a/admin/Makefile.am b/admin/Makefile.am index 2b413d28..c7c2af43 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -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 diff --git a/conf/Makefile.am b/conf/Makefile.am index d7681f73..658eb1b5 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -2,7 +2,16 @@ AUTOMAKE_OPTIONS = foreign -EXTRA_DIST = icecast.xml +EXTRA_DIST = icecast.xml.in + +sysconf_DATA = icecast.xml + +edit = sed -e 's,@pkgdatadir\@,$(pkgdatadir),g' \ + -e 's,@localstatedir\@,$(localstatedir),g' \ + -e 's,@PACKAGE\@,$(PACKAGE),g' + +icecast.xml: $(srcdir)/icecast.xml.in + $(edit) $(srcdir)/icecast.xml.in > icecast.xml debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/conf/icecast.xml b/conf/icecast.xml.in similarity index 94% rename from conf/icecast.xml rename to conf/icecast.xml.in index 1ee2ef99..ffb6038f 100644 --- a/conf/icecast.xml +++ b/conf/icecast.xml.in @@ -84,13 +84,13 @@ 1 - /usr/local/icecast + @pkgdatadir@ - /usr/local/icecast/logs - /usr/local/icecast/web - /usr/local/icecast/admin + @localstatedir@/@PACKAGE@/logs + @pkgdatadir@/web + @pkgdatadir@/admin