aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2006-12-09 14:39:06 +0000
committerPetter Reinholdtsen <pere@hungry.com>2006-12-09 14:39:06 +0000
commit083f362f83dd690ef3be2b3afbdf2607558b080e (patch)
tree6aaf7bd362dd4e489337fbaf2a4913d681a9a0b1
parentad72bd95cb271d00575dfa7a95830287d0cc710a (diff)
downloadsitesummary-083f362f83dd690ef3be2b3afbdf2607558b080e.tar.gz
sitesummary-083f362f83dd690ef3be2b3afbdf2607558b080e.tar.bz2
sitesummary-083f362f83dd690ef3be2b3afbdf2607558b080e.tar.xz
* Fix regex used to extract eth0 MAC address, to avoid matching peth0
on a vmware box. * Improve template text to include the example URL. to make it easier to come up with URLs usable from external machines. * Add perl-modules as dependency for sitesummary-client, to make sure Getopt::Std is available for sitesummary-upload. * Add new collect.d/debian to collect debian specific stuff. Now collects /etc/debian_version and the output from dpkg -l. * Change the collector to use the mac address from eth1 or eth2 if eth0 isn't usable. * Throw away error messages from dmidecode when collecting info, to avoid daily cron mails from Xen machines. * Only use a2dissite to disable the site if it is enabled.
-rw-r--r--debian/sitesummary.postinst7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/sitesummary.postinst b/debian/sitesummary.postinst
index 7a77533..fefb38f 100644
--- a/debian/sitesummary.postinst
+++ b/debian/sitesummary.postinst
@@ -3,8 +3,11 @@
set -e
# Adjust to the new config location, in /etc/apache2/conf.d/sitesummary
-if [ -f /etc/apache2/sites-available/sitesummary ]; then
- [ -x /usr/sbin/a2dissite ] && a2dissite sitesummary
+if [ -f /etc/apache2/sites-available/sitesummary ] ; then
+ if [ -f /etc/apache2/sites-enabled//sitesummary ] &&
+ [ -x /usr/sbin/a2dissite ] ; then
+ a2dissite sitesummary
+ fi
rm /etc/apache2/sites-available/sitesummary
fi