diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/sitesummary-client.config | 15 | ||||
| -rw-r--r-- | debian/sitesummary-client.install | 2 | ||||
| -rw-r--r-- | debian/sitesummary-client.postinst | 27 | ||||
| -rw-r--r-- | debian/sitesummary-client.templates | 8 | ||||
| -rw-r--r-- | sitesummary-client | 11 | ||||
| -rw-r--r-- | sitesummary-client.conf | 5 |
8 files changed, 59 insertions, 16 deletions
@@ -38,8 +38,8 @@ install-server: install-client: $(INSTALL) -d $(DESTDIR)$(sbindir) $(INSTALL) sitesummary-client sitesummary-upload $(DESTDIR)$(sbindir) - $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/config - $(INSTALL_DATA) sitesummary-client.conf $(DESTDIR)$(pkgdatadir)/config + $(INSTALL) -d $(DESTDIR)$(pkgdatadir) + $(INSTALL_DATA) sitesummary-client.conf $(DESTDIR)$(pkgdatadir)/ $(INSTALL) -d $(DESTDIR)$(collectordir) for collector in $(COLLECTORS) ; do \ diff --git a/debian/changelog b/debian/changelog index 3dadd94..35da5a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,7 @@ sitesummary (0.0.2) UNRELEASED; urgency=low * Not released yet. * Make temp file name more unique by adding process id to it, while I wait for a working getpeername call. - * Add debconf question for site, and start on code to ask for - collector URL. + * Add debconf question for collector URLs and site. -- Petter Reinholdtsen <pere@debian.org> Sat, 26 Aug 2006 12:10:27 +0200 diff --git a/debian/sitesummary-client.config b/debian/sitesummary-client.config index e8dffc5..c3076c8 100644 --- a/debian/sitesummary-client.config +++ b/debian/sitesummary-client.config @@ -3,6 +3,21 @@ # if we do not have debconf, we just skip this . /usr/share/debconf/confmodule || exit 0 +# Read the package default, need to match the code in sitesummary-client +[ -f /usr/share/sitesummary/sitesummary-client.conf ] && \ + . /usr/share/sitesummary/sitesummary-client.conf +for confdir in \ + /usr/share/sitesummary/config.d \ + /etc/sitesummary/config.d +do + [ -d $confdir ] || continue + for config in $confdir/* ; do + [ -f $config ] && . $config + done +done + +db_set sitesummary-client/collector_url "$serverurls" + db_input medium sitesummary-client/collector_url || true db_go || true diff --git a/debian/sitesummary-client.install b/debian/sitesummary-client.install index 23e99ce..a3fbfda 100644 --- a/debian/sitesummary-client.install +++ b/debian/sitesummary-client.install @@ -1,3 +1,3 @@ debian/tmp/usr/sbin debian/tmp/usr/lib/sitesummary/collect.d -debian/tmp/usr/share/sitesummary/config +debian/tmp/usr/share/sitesummary/sitesummary-client.conf diff --git a/debian/sitesummary-client.postinst b/debian/sitesummary-client.postinst index 3d43043..460f1a0 100644 --- a/debian/sitesummary-client.postinst +++ b/debian/sitesummary-client.postinst @@ -4,9 +4,36 @@ set -e . /usr/share/debconf/confmodule +# Read the package default, need to match the code in sitesummary-client +[ -f /usr/share/sitesummary/sitesummary-client.conf ] && \ + . /usr/share/sitesummary/sitesummary-client.conf +for confdir in \ + /usr/share/sitesummary/config.d \ + /etc/sitesummary/config.d +do + [ -d $confdir ] || continue + for config in $confdir/* ; do + [ -f $config ] && . $config + done +done + db_get sitesummary-client/collector_url URL="$RET" +# Only update the URLs if it is different from the current value +if [ "$URL" != "$serverurls" ] ; then + if [ -f /etc/sitesummary/config.d/00debconf ] ; then + if grep -q '^serverurls=' /etc/sitesummary/config.d/00debconf ; then + sed "s%^serverurls=.*\$%serverurls=\"$URL\"%" < /etc/sitesummary/config.d/00debconf > /etc/sitesummary/config.d/00debconf.new && mv /etc/sitesummary/config.d/00debconf.new /etc/sitesummary/config.d/00debconf + else + echo "serverurls=\"$URL\"/" >> /etc/sitesummary/config.d/00debconf + fi + else + mkdir -p /etc/sitesummary/config.d + echo "serverurls=\"$URL\"" > /etc/sitesummary/config.d/00debconf + fi +fi + db_get sitesummary-client/site SITE="$RET" diff --git a/debian/sitesummary-client.templates b/debian/sitesummary-client.templates index 78d4a32..c987974 100644 --- a/debian/sitesummary-client.templates +++ b/debian/sitesummary-client.templates @@ -1,10 +1,12 @@ Template: sitesummary-client/collector_url Type: string -_Description: URL to sitesummary collector - Where should the sitesummary information be submitted +_Description: URL? + Insert the URL to the sitesummary collector, where should the + sitesummary information be submitted. Several URLs can be specified + separated by space. Template: sitesummary-client/site Type: string -_Description: Site string +_Description: Site? Insert a string identifying the site where this machine is located. diff --git a/sitesummary-client b/sitesummary-client index 6a7c7c4..e799bd8 100644 --- a/sitesummary-client +++ b/sitesummary-client @@ -13,12 +13,6 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin # storage area on diskless clients, so use /tmp/. tmpdir=/tmp/sitesummary-$$ -#serverurls="http://developer.skolelinux.no/cgi-bin/popcon-submit.cgi" -serverurls="http://localhost/cgi-bin/sitesummary-collector.cgi" -fragdirs="/usr/lib/sitesummary/collect.d \ - /etc/sitesummary/collect.d" -gpgencrypt=false - log() { msg="$@" echo "$msg" @@ -46,8 +40,9 @@ gpg_encrypt_for_url() { gpg $GPGOPTS -e $infile > $outfile } -# Read the package default -[ -f /usr/share/sitesummary/config ] && . /usr/share/sitesummary/config +# Read the package default +[ -f /usr/share/sitesummary/sitesummary-client.conf ] && \ + . /usr/share/sitesummary/sitesummary-client.conf for confdir in \ /usr/share/sitesummary/config.d \ /etc/sitesummary/config.d diff --git a/sitesummary-client.conf b/sitesummary-client.conf index e69de29..0d74905 100644 --- a/sitesummary-client.conf +++ b/sitesummary-client.conf @@ -0,0 +1,5 @@ +serverurls="http://localhost/cgi-bin/sitesummary-collector.cgi" + +fragdirs="/usr/lib/sitesummary/collect.d /etc/sitesummary/collect.d" + +gpgencrypt=false |