aboutsummaryrefslogtreecommitdiffstats
path: root/sitesummary-client
diff options
context:
space:
mode:
Diffstat (limited to 'sitesummary-client')
-rw-r--r--sitesummary-client11
1 files changed, 3 insertions, 8 deletions
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