diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2014-08-21 10:22:59 +0200 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2014-08-21 11:05:44 +0200 |
| commit | 08e3a22d26ea236a64551a35de90379c64439ebf (patch) | |
| tree | ffc3591239bca7a11bd802f95fc79c8b7cee1320 | |
| parent | 121ee06d385740e22ca02ba49e9b25a7040e9038 (diff) | |
| download | sitesummary-08e3a22d26ea236a64551a35de90379c64439ebf.tar.gz sitesummary-08e3a22d26ea236a64551a35de90379c64439ebf.tar.bz2 sitesummary-08e3a22d26ea236a64551a35de90379c64439ebf.tar.xz | |
Migrate setup to Apache 2.4 (Closes: #669782).
Rename conffile /etc/apache2/conf.d/sitesummary to
/etc/apache2/conf-available/sitesummary.conf and update
postinst to enable it by default on fresh installs.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/sitesummary.maintscript | 1 | ||||
| -rw-r--r-- | debian/sitesummary.postinst | 11 |
5 files changed, 18 insertions, 4 deletions
@@ -50,8 +50,8 @@ install-server: $(INSTALL) expire-entry $(DESTDIR)$(pkgdir)/ - $(INSTALL) -d $(DESTDIR)/etc/apache2/conf.d - $(INSTALL_DATA) apache.conf $(DESTDIR)/etc/apache2/conf.d/sitesummary + $(INSTALL) -d $(DESTDIR)/etc/apache2/conf-available + $(INSTALL_DATA) apache.conf $(DESTDIR)/etc/apache2/conf-available/sitesummary.conf $(INSTALL) -o www-data -d $(DESTDIR)$(pkgvardir)/entries $(INSTALL) -o www-data -d $(DESTDIR)$(pkgvardir)/tmpstorage diff --git a/debian/changelog b/debian/changelog index 719482d..58a7310 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ sitesummary (0.1.11) UNRELEASED; urgency=low + * Migrate setup to Apache 2.4 (Closes: #669782). Rename conffile + /etc/apache2/conf.d/sitesummary to + /etc/apache2/conf-available/sitesummary.conf. Add code in + postinst to enable the apache configuration by default on fresh + installs. * Add missing ${perl:Depends} to binary packages dependency list. -- Petter Reinholdtsen <pere@debian.org> Thu, 21 Aug 2014 10:21:24 +0200 diff --git a/debian/control b/debian/control index 1633f36..73405f9 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/sitesummary Package: sitesummary Architecture: all +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${perl:Depends}, gnupg, net-tools, perl-modules Recommends: apache2-mpm-worker | httpd, sitesummary-client Suggests: munin, munin-node, nagios3, nagios-plugins-standard, ldap-utils, cups-client diff --git a/debian/sitesummary.maintscript b/debian/sitesummary.maintscript new file mode 100644 index 0000000..988729c --- /dev/null +++ b/debian/sitesummary.maintscript @@ -0,0 +1 @@ +mv_conffile /etc/apache2/conf.d/sitesummary /etc/apache2/conf-available/sitesummary.conf 0.1.10 diff --git a/debian/sitesummary.postinst b/debian/sitesummary.postinst index c1c82b9..a3301bf 100644 --- a/debian/sitesummary.postinst +++ b/debian/sitesummary.postinst @@ -37,6 +37,8 @@ EOF fi } +#DEBHELPER# + case "$1" in configure) @@ -50,6 +52,13 @@ case "$1" in rm /etc/apache2/sites-available/sitesummary fi + # Enable it on fresh installations as before Apache 2.4. + if [ -z "$2" ] && \ + [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke enconf sitesummary.conf + fi + # Make sure the cgi script can write to the storage area chown www-data /var/lib/sitesummary/tmpstorage \ /var/lib/sitesummary/entries @@ -91,6 +100,4 @@ case "$1" in ;; esac -#DEBHELPER# - exit 0 |