[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/7.0_dfsg-7-2-g2ec208d

[Sergey B Kirpichev]

The following commit has been merged in the master branch:
commit 2ec208da2065a78953d3467ea7268671aa7c93e9
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Wed Dec 12 14:47:08 2012 +0400

    Add option to easy switch off awstats crontabs.  Install symlink for awstats binary to /usr/bin.  Closes: #641481.

diff --git a/debian/awstats.links b/debian/awstats.links
index fe0bb16..640ac4b 100644
--- a/debian/awstats.links
+++ b/debian/awstats.links
@@ -1 +1,2 @@
 usr/share/doc/awstats/changelog.gz usr/share/doc/awstats/html/awstats_changelog.txt.gz
+usr/lib/cgi-bin/awstats.pl usr/bin/awstats
diff --git a/debian/buildstatic.sh b/debian/buildstatic.sh
index 5f68d67..6515c4f 100755
--- a/debian/buildstatic.sh
+++ b/debian/buildstatic.sh
@@ -24,7 +24,9 @@ AWSTATS_ENABLE_BUILDSTATICPAGES="yes"
 AWSTATS_LANG="en"
 [ ! -r "$DEFAULT" ] || . "$DEFAULT"
 
-[ "$AWSTATS_ENABLE_BUILDSTATICPAGES" = "yes" ] || exit 0
+# For compatibility: handle empty AWSTATS_ENABLE_CRONTABS as "yes":
+[ "${AWSTATS_ENABLE_CRONTABS:-yes}" = "yes" -a \
+  "$AWSTATS_ENABLE_BUILDSTATICPAGES" = "yes" ] || exit 0
 
 cd /etc/awstats
 
diff --git a/debian/default/awstats b/debian/default/awstats
index 1960aaf..cf06f7d 100644
--- a/debian/default/awstats
+++ b/debian/default/awstats
@@ -7,8 +7,13 @@ AWSTATS_NICE=10
 
 # This variable controls whether to create static html reports every
 # night in /var/cache/awstats/.  Set to "yes" or "no".
+# To enable this you should also set AWSTATS_ENABLE_CRONTABS to "yes".
 AWSTATS_ENABLE_BUILDSTATICPAGES="yes"
 
-# This variable control the language of all static html reports.  Set
+# This variable controls the language of all static html reports.  Set
 # one to appropriate two-letter language code (default to en).
 AWSTATS_LANG="en"
+
+# This variable controls whether to run regular cron jobs for awstats.  Set
+# to "yes" or "no" (default to "yes").
+AWSTATS_ENABLE_CRONTABS="yes"
diff --git a/debian/update.sh b/debian/update.sh
index 55c4244..c83bfeb 100755
--- a/debian/update.sh
+++ b/debian/update.sh
@@ -19,6 +19,9 @@ trap 'rm -f $ERRFILE' INT QUIT TERM EXIT
 AWSTATS_NICE=10
 [ ! -r "$DEFAULT" ] || . "$DEFAULT"
 
+# For compatibility: handle empty AWSTATS_ENABLE_CRONTABS as "yes":
+[ "${AWSTATS_ENABLE_CRONTABS:-yes}" = "yes" ] || exit 0
+
 cd /etc/awstats
 
 for c in `/bin/ls -1 awstats.*.conf 2>/dev/null | \

-- 
awstats Debian packaging