fix adv_graphgen, github_listener

3 files changed, 16 insertions, 16 deletions

diff --git a/retiolum/scripts/github_listener/github_listener.conf b/retiolum/scripts/github_listener/github_listener.conf
index 88c8ea60..c4f0a8b6 100644
--- a/retiolum/scripts/github_listener/github_listener.conf
+++ b/retiolum/scripts/github_listener/github_listener.conf
@@ -1,4 +1,5 @@
 [program:github_listener]
-command=/opt/github_listener/retiolum/scripts/github_listener/listen 5432
+command=nc -lvv -p 5432 -c "./handle_request /opt/github_listener/retiolum/hosts /var/www/euer.krebsco.de/retiolum/"
 user=tinc
-environment=HOSTFOLDER='/opt/github_listener/retiolum/hosts',WEBDIR='/srv/http/pub/retiolum/'
+directory=/krebs/retiolum/scripts/github_listener/
+autorestart=true
diff --git a/retiolum/scripts/github_listener/handle_request b/retiolum/scripts/github_listener/handle_request
index 2df05ae0..5b42524a 100755
--- a/retiolum/scripts/github_listener/handle_request
+++ b/retiolum/scripts/github_listener/handle_request
@@ -3,14 +3,21 @@
 #   WEBDIR 
 #   HOSTFOLDER
 set -euf
-HOSTFOLDER=${HOSTFOLDER:-../../hosts}
+if [ "x${2:-}" = x ];then
+	echo "usage: $0 HOSTDIRECTORY WEBDIRECTORY"
+	exit 1
+fi
+export HOSTDIR=${1:-../../hosts}
+WEBDIR=${2:-/var/www/euer.krebsco.de/retiolum/}
+echo "sorry for keeping you waiting, please be patient"
+
 cd $(dirname $(readlink -f $0))
-cd "$HOSTFOLDER"
+
+cd "$HOSTDIR"
 git pull origin master  >&2
+echo "First step done"
 cd - >&2
-
-echo "sorry for keeping you waiting, please be patient"
-../../bin/create-supernode-tar
+../../bin/create-supernode-tar $WEBDIR
 echo "almost done..."
-../../bin/create-host-tar
+../../bin/create-host-tar $WEBDIR
 echo "Thank you for your patience!"
diff --git a/retiolum/scripts/github_listener/listen b/retiolum/scripts/github_listener/listen
deleted file mode 100755
index 30f0c4b5..00000000
--- a/retiolum/scripts/github_listener/listen
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-PORT=${1:-5432}
-# eloop pattern
-cd $(dirname $(readlink -f $0))
-while sleep 1; do
-  nc -lvv -p $PORT -e ./handle_request && logger "successfully built retiolum hosts tarball"
-
-done