diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2006-10-06 17:21:00 +0000 |
|---|---|---|
| committer | Petter Reinholdtsen <pere@hungry.com> | 2006-10-06 17:21:00 +0000 |
| commit | 10be83353ce3dd2502fc08901eaf808ce5c080a0 (patch) | |
| tree | 924d460003820880dc9b542d5b66297c4cd681db | |
| parent | cb70f95eaae71fc0c671561e79c9cb5f534ccb36 (diff) | |
| download | sitesummary-10be83353ce3dd2502fc08901eaf808ce5c080a0.tar.gz sitesummary-10be83353ce3dd2502fc08901eaf808ce5c080a0.tar.bz2 sitesummary-10be83353ce3dd2502fc08901eaf808ce5c080a0.tar.xz | |
* Add symlink from /etc/apache/conf.d/sitesummary to
/etc/apache2/conf.d/sitesummary, to work with both apache and
apache2. Adjust dependency accordingly, and rewrite postinst to
continue working when apache2-common isn't installed.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/sitesummary.links | 1 | ||||
| -rw-r--r-- | debian/sitesummary.postinst | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 54eb06e..726ae80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ sitesummary (0.0.14~1) unstable; urgency=low * Correct typo in recommends list for sitesummary-client; dmidecide->dmidecode. (Closes: #391255) + * Add symlink from /etc/apache/conf.d/sitesummary to + /etc/apache2/conf.d/sitesummary, to work with both apache and + apache2. Adjust dependency accordingly, and rewrite postinst to + continue working when apache2-common isn't installed. -- Petter Reinholdtsen <pere@debian.org> Fri, 6 Oct 2006 17:17:17 +0200 diff --git a/debian/control b/debian/control index d2cb0b1..7645912 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2 Package: sitesummary Architecture: all -Depends: gnupg, apache2-common +Depends: gnupg Recommends: ${misc:Depends}, apache2-mpm-worker | httpd, sitesummary-client Description: Generate site summary of submitting hosts (server part) The sitesummary system makes it easier to keep track of a lot of diff --git a/debian/sitesummary.links b/debian/sitesummary.links new file mode 100644 index 0000000..5d00c2f --- /dev/null +++ b/debian/sitesummary.links @@ -0,0 +1 @@ +/etc/apache2/conf.d/sitesummary /etc/apache/conf.d/sitesummary diff --git a/debian/sitesummary.postinst b/debian/sitesummary.postinst index 84b3f88..7a77533 100644 --- a/debian/sitesummary.postinst +++ b/debian/sitesummary.postinst @@ -4,7 +4,7 @@ set -e # Adjust to the new config location, in /etc/apache2/conf.d/sitesummary if [ -f /etc/apache2/sites-available/sitesummary ]; then - a2dissite sitesummary + [ -x /usr/sbin/a2dissite ] && a2dissite sitesummary rm /etc/apache2/sites-available/sitesummary fi |