modified makefile (install), conf/prometheus

git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@51 251d49ef-1d17-4917-a970-b30cf55b089b

diff --git a/Makefile b/Makefile
index c820a17aa2435a478b4daa70f17fdd2d90b6bba4..d54e7ea619c3478f8f60ee09872cc50ab3eab2d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,11 @@ install: main
        install -m 755 prometheus $(sbindir)
        install -m 644 prometheus.1 $(mandir)/man1
        install -m 644 prometheus.conf.5 $(mandir)/man5
-       install -m 755 etc/cron.d/prometheus $(sysconfdir)/cron.d
-       install -m 755 etc/init.d/prometheus $(sysconfdir)/init.d
-       install -m 600 etc/prometheus/prometheus.conf $(sysconfdir)/prometheus
-       install -m 600 etc/prometheus/hosts $(sysconfdir)/prometheus
+       install -m 755 conf/prometheus.cron $(sysconfdir)/cron.d/prometheus
+       install -m 755 conf/prometheus.init $(sysconfdir)/init.d/prometheus
+       install -m 600 conf/prometheus.conf $(sysconfdir)/prometheus
+       install -m 600 conf/prometheus.hosts $(sysconfdir)/prometheus/hosts
+       install -m 644 conf/prometheus.default $(sysconfdir)/default/prometheus
 
 clean:
        rm -f prometheus

diff --git a/conf/prometheus.conf b/conf/prometheus.conf
index 2c90a301120eb6d4f3e19152a4755f62de4377df..27002015dcce0b9ad1b9627c3708b3dbd831f786 100644 (file)
--- a/conf/prometheus.conf
+++ b/conf/prometheus.conf
@@ -11,8 +11,8 @@
 #Path to external utilities required to run iGW Prometheus:
 #--------------------------------------------------------------------------
 tc                     /sbin/tc
-iptables               /usr/sbin/iptables
-iptables-restore       /usr/sbin/iptables-restore
+iptables               /sbin/iptables
+iptables-restore       /sbin/iptables-restore
 #==========================================================================
 #Filename of iptables mangle table for iptables-restore
 #-------------------------------------------------------------------------- 

diff --git a/conf/prometheus.default b/conf/prometheus.default
new file mode 100644 (file)
index 0000000..c1d7739
--- /dev/null
+++ b/conf/prometheus.default
@@ -0,0 +1,2 @@
+# Run prometheus on startup 
+PROMETHEUS_ENABLE=No
\ No newline at end of file

diff --git a/conf/prometheus.init b/conf/prometheus.init
index c0f8170deaf7d20e77443b26596c180dd7e46342..59a1322bd425b0a71cf4e2c479f95765148f9ece 100644 (file)
--- a/conf/prometheus.init
+++ b/conf/prometheus.init
@@ -1,5 +1,21 @@
 #!/bin/sh
-EXEFILE=/usr/sbin/prometheus
+EXEFILE=`which prometheus`
+DEFAULT=/etc/default/prometheus
+
+if [ -e $DEFAULT ]; then
+    . $DEFAULT
+
+    case "$PROMETHEUS_ENABLE" in
+       [Nn]*)
+           echo "Prometheus disabled in /etc/default/prometheus !"
+           exit 0
+       ;;
+    esac
+
+else
+    echo "File /etc/default/prometheus not found !"
+    exit 0
+fi    
 
 case "$1" in
     start)