[slbackup-commit] CVS update: slbackup-php/debian changelog links
postinst postrm prerm
werner at alioth.debian.org
werner at alioth.debian.org
Tue Apr 17 04:44:05 UTC 2007
User: werner
Date: 07/04/17 04:44:05
Modified: debian changelog links postinst postrm prerm
Log:
moving apache config to conf.d/
Revision Changes Path
1.12 +1 -0 slbackup-php/debian/changelog
Index: changelog
===================================================================
RCS file: /cvsroot/slbackup/slbackup-php/debian/changelog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- changelog 17 Apr 2007 01:02:56 -0000 1.11
+++ changelog 17 Apr 2007 04:44:05 -0000 1.12
@@ -5,6 +5,7 @@
* Added myself as uploader.
* Changed 'todo' in package description to 'not implemented'.
* Polished the Apache config a bit.
+ * Change from using sites-available/ to conf.d/ for Apache config.
[ Finn-Arne Johansen ]
* Added logout functionality
1.3 +1 -1 slbackup-php/debian/links
Index: links
===================================================================
RCS file: /cvsroot/slbackup/slbackup-php/debian/links,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- links 13 Apr 2007 10:00:55 -0000 1.2
+++ links 17 Apr 2007 04:44:05 -0000 1.3
@@ -1 +1 @@
-etc/slbackup-php/apache.conf etc/apache2/sites-available/slbackup
+etc/slbackup-php/apache.conf etc/apache2/conf.d/slbackup
1.2 +1 -11 slbackup-php/debian/postinst
Index: postinst
===================================================================
RCS file: /cvsroot/slbackup/slbackup-php/debian/postinst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- postinst 13 Apr 2007 09:41:33 -0000 1.1
+++ postinst 17 Apr 2007 04:44:05 -0000 1.2
@@ -4,17 +4,7 @@
. /usr/share/debconf/confmodule
-if [ -x /usr/sbin/a2ensite ] && [ -x /usr/sbin/a2enmod ]; then
- /usr/sbin/a2ensite slbackup >/dev/null
- /usr/sbin/a2enmod rewrite > /dev/null
- if [ -x /usr/sbin/invoke-rc.d ] ; then
- /usr/sbin/invoke-rc.d apache2 force-reload || :
- else
- [ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 force-reload || :
- fi
-else
- echo "Can't detect apache2 package and therefore not enabling the site"
-fi
+# should we do a2dissite when upgrading from 0.0.1??
mkdir -p /var/spool/slbackup-php
1.3 +1 -1 slbackup-php/debian/postrm
Index: postrm
===================================================================
RCS file: /cvsroot/slbackup/slbackup-php/debian/postrm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- postrm 13 Apr 2007 21:29:23 -0000 1.2
+++ postrm 17 Apr 2007 04:44:05 -0000 1.3
@@ -2,7 +2,7 @@
set -e
-if [ -d /var/spool/slbackup-php ]; do
+if [ -d /var/spool/slbackup-php ]; then
rm -rf /var/spool/slbackup-php/
fi
1.2 +3 -10 slbackup-php/debian/prerm
Index: prerm
===================================================================
RCS file: /cvsroot/slbackup/slbackup-php/debian/prerm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prerm 13 Apr 2007 09:41:33 -0000 1.1
+++ prerm 17 Apr 2007 04:44:05 -0000 1.2
@@ -2,15 +2,8 @@
set -e
-if [ -x /usr/sbin/a2dissite ] && [ -L /etc/apache2/sites-enabled/slbackup-php ] ; then
- /usr/sbin/a2dissite slbackup-php >/dev/null
- if [ -x "`which invoke-rc.d 2>/dev/null`" ] ; then
- /usr/sbin/invoke-rc.d apache2 force-reload || :
- else
- [ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 force-reload || :
- fi
-else
- echo "Can't detect apache2-common, so don't disabling slbackup-php."
-fi
+# Should we reload apache on removal to remove config?
+# (in that case this block should be moved to postrm and
+# apache should only be reloaeded if the users did say it was ok?)
#DEBHELPER#
More information about the slbackup-commit
mailing list