1 files changed, 27 insertions, 12 deletions
diff --git a/sitesummary-client b/sitesummary-client
index 144bf79..8188ce3 100644
--- a/sitesummary-client
+++ b/sitesummary-client
@@ -11,12 +11,23 @@ set -e
 # 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"
     logger -p user.info -t sitesummary-client "$msg"
 }
 
+error() {
+    msg="$@"
+    log "error: $msg"
+}
+
 # Check or get GPG key, return false if it is unavailable
 get_gpg_key_if_missing() {
     url="$1"
@@ -39,10 +50,10 @@ for confdir in \
     /usr/share/sitesummary/config.d \
     /etc/sitesummary/config.d
 do
-  [ -d $confdir ] || continue
-  for config in $confdir/* ; do
-      [ -f $conf ] && . $conf
-  done
+    [ -d $confdir ] || continue
+    for config in $confdir/* ; do
+	[ -f $conf ] && . $conf
+    done
 done
 
 mkdir $tmpdir && cd $tmpdir
@@ -59,15 +70,19 @@ hostsummaryfile=$tmpdir.tar.gz
 tar zcf $hostsummaryfile .
 
 for url in $serverurls ; do
-    #WGETOPTS="--no-check-certificate"
-    if get_gpg_key_if_missing $url ; then
-	gpg_encrypt_for_url $url $hostsummaryfile $hostsummaryfile.gpg
-	if wget -q $WGETOPTS --post-file $hostsummaryfile.gpg -O $tmpdir.result $url ; then
-	    :
-	else
-	    log "error: unable to submit to '$url'"
+    if [ "$gpgencrypt" != false ] ; then
+	if get_gpg_key_if_missing $url ; then
+	    error "gpg key for '$url' is unavailable.  refusing to submit."
+	    continue
 	fi
+	gpg_encrypt_for_url $url "$hostsummaryfile" "$hostsummaryfile.gpg"
+	hostsummaryfile="$hostsummaryfile.gpg"
+    fi
+
+    #WGETOPTS="--no-check-certificate"
+    if /home/pere/src/debiancvs/debianedusvn/src/sitesummary/sitesummary-upload  -u $url -f $hostsummaryfile -d; then
+	:
     else
-	log "error: gpg key for '$url' is unavailable.  refusing to submit."
+	error "unable to submit to '$url'"
     fi
 done