[Pkg-voip-commits] r6182 - in /mumble/trunk/debian: changelog mumble-server-web.conf mumble-server-web.dirs mumble-server-web.install mumble-server-web.links mumble-server-web.postinst mumble-server.default mumble.postinst rules
slicer-guest at alioth.debian.org
slicer-guest at alioth.debian.org
Tue Sep 9 13:33:30 UTC 2008
Author: slicer-guest
Date: Tue Sep 9 13:33:29 2008
New Revision: 6182
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6182
Log:
* Create a apache config file and put the web files under
/usr/share/mumble-server-web
* Remove the restart of hald, as we no longer use it.
* Default to starting mumble-server.
Added:
mumble/trunk/debian/mumble-server-web.conf
mumble/trunk/debian/mumble-server-web.dirs
mumble/trunk/debian/mumble-server-web.postinst
Removed:
mumble/trunk/debian/mumble.postinst
Modified:
mumble/trunk/debian/changelog
mumble/trunk/debian/mumble-server-web.install
mumble/trunk/debian/mumble-server-web.links
mumble/trunk/debian/mumble-server.default
mumble/trunk/debian/rules
Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=6182&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Tue Sep 9 13:33:29 2008
@@ -8,6 +8,10 @@
the zeroc-ice-php package adds support for profiles.
* Japanese translation from
Masayuki Hamasaki <ikasamah at users.sourceforge.net>.
+ * Create a apache config file and put the web files under
+ /usr/share/mumble-server-web
+ * Remove the restart of hald, as we no longer use it.
+ * Default to starting mumble-server.
[ Patrick Matthäi ]
* Do not install var/www/mumble-server/index.php with executable rights.
Added: mumble/trunk/debian/mumble-server-web.conf
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server-web.conf?rev=6182&op=file
==============================================================================
--- mumble/trunk/debian/mumble-server-web.conf (added)
+++ mumble/trunk/debian/mumble-server-web.conf Tue Sep 9 13:33:29 2008
@@ -1,0 +1,9 @@
+Alias /mumble/ /usr/share/mumble-server-web/www/
+<Directory /usr/share/mumble-server-web/www/>
+ Options ExecCGI FollowSymLinks
+ AllowOverride None
+ DirectoryIndex index.php
+ AddHandler cgi-script .cgi
+ Order allow,deny
+ Allow from all
+</Directory>
Added: mumble/trunk/debian/mumble-server-web.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server-web.dirs?rev=6182&op=file
==============================================================================
--- mumble/trunk/debian/mumble-server-web.dirs (added)
+++ mumble/trunk/debian/mumble-server-web.dirs Tue Sep 9 13:33:29 2008
@@ -1,0 +1,1 @@
+usr/share/mumble-server-web/www
Modified: mumble/trunk/debian/mumble-server-web.install
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server-web.install?rev=6182&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server-web.install (original)
+++ mumble/trunk/debian/mumble-server-web.install Tue Sep 9 13:33:29 2008
@@ -1,1 +1,3 @@
debian/MurmurPHP.ini etc/php5/conf.d
+debian/mumble-server-web.conf etc/apache2/conf.d
+scripts/weblist.php usr/share/mumble-server-web/www
Modified: mumble/trunk/debian/mumble-server-web.links
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server-web.links?rev=6182&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server-web.links (original)
+++ mumble/trunk/debian/mumble-server-web.links Tue Sep 9 13:33:29 2008
@@ -1,1 +1,1 @@
-usr/share/mumble-server-web var/www/mumble-server
+usr/share/mumble-server-web/www/weblist.php usr/share/mumble-server-web/www/index.php
Added: mumble/trunk/debian/mumble-server-web.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server-web.postinst?rev=6182&op=file
==============================================================================
--- mumble/trunk/debian/mumble-server-web.postinst (added)
+++ mumble/trunk/debian/mumble-server-web.postinst Tue Sep 9 13:33:29 2008
@@ -1,0 +1,35 @@
+#! /bin/sh
+# postinst script for mumble-server-web
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+ configure)
+ # Restart apache2 to load new config
+ invoke-rc.d --quiet apache2 reload
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Modified: mumble/trunk/debian/mumble-server.default
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.default?rev=6182&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.default (original)
+++ mumble/trunk/debian/mumble-server.default Tue Sep 9 13:33:29 2008
@@ -1,2 +1,2 @@
# 0 = don't start, 1 = start
-MURMUR_DAEMON_START=0
+MURMUR_DAEMON_START=1
Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=6182&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Tue Sep 9 13:33:29 2008
@@ -40,9 +40,8 @@
dh_installdirs -i
dh_install -i
# Install and rename web scripts
- install -m 0755 -D ./scripts/murmur.pl $(CURDIR)/debian/mumble-server-web/usr/lib/cgi-bin/mumble-server/register.cgi
- install -m 0755 -D ./scripts/weblist.pl $(CURDIR)/debian/mumble-server-web/usr/lib/cgi-bin/mumble-server/list.cgi
- install -m 0644 -D ./scripts/weblist.php $(CURDIR)/debian/mumble-server-web/usr/share/mumble-server-web/index.php
+ install -m 0755 -D ./scripts/murmur.pl $(CURDIR)/debian/mumble-server-web/usr/share/mumble-server-web/www/register.cgi
+ install -m 0755 -D ./scripts/weblist.pl $(CURDIR)/debian/mumble-server-web/usr/share/mumble-server-web/www/weblist.cgi
install-arch:
dh_testdir
More information about the Pkg-voip-commits
mailing list