From 59a5e97c767a90437946aa3aca0c8518df662084 Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Mon, 17 Nov 2008 22:55:52 +0000
Subject: [PATCH] fixes to the monitor-server.init to update the password if
 any of serveral actions occur. added zabbix as dependency of monitor-server.
 fixed bug in zabbix.spec to uncommend DBPassword field in zabbix_server.conf

---
 Monitor.spec        |  4 ++++
 monitor-server.init | 24 +++++++++++++++++-------
 setup.py            |  2 +-
 zabbix.spec         |  1 +
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Monitor.spec b/Monitor.spec
index 1c5ff1f..335ab16 100644
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -62,6 +62,10 @@ Requires: nmap
 Requires: PLCWWW >= 4.2
 Requires: bootcd-planetlab-i386 >= 4.2
 
+Requires: zabbix-client
+Requires: zabbix-gui
+Requires: zabbix-server
+
 %description server
 The server side include all python modules and scripts needed to fully
 operation, track, and interact with any third-party monitoring software, such
diff --git a/monitor-server.init b/monitor-server.init
index 3451f1a..4da26c4 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -40,16 +40,19 @@ ZABBIX_DB_NAME="zabbix"
 
 function check_user_and_db()
 {
+    CREATED=
     # confirm user is present or create it
-    user_present=$( psql -U postgres -c "select * from pg_user;" -d template1 | grep $ZABBIX_DB_NAME )
+    user_present=$( psql -U postgres -c "select * from pg_user;" -d template1 | grep $ZABBIX_DB_USER )
     if [ -z $user_present ] ; then 
-        createuser --no-superuser --no-createdb --no-createrole --login --unencrypted --echo $ZABBIX_DB_NAME -U postgres
+        createuser --no-superuser --no-createdb --no-createrole --login --unencrypted --echo $ZABBIX_DB_USER -U postgres
+		CREATED="true"
     fi
     
     # confirm database is present or create it
     db_present=$( psql -U postgres -c "select * from pg_database;" -d template1 | grep $ZABBIX_DB_NAME )
     if [ -z $db_present ] ; then
-        createdb --owner=$ZABBIX_DB_NAME $ZABBIX_DB_NAME -U postgres
+        createdb --owner=$ZABBIX_DB_USER $ZABBIX_DB_NAME -U postgres
+		CREATED="true"
     fi
 
     # Create/update the unprivileged database user and password
@@ -57,8 +60,11 @@ function check_user_and_db()
         # Zabbix doesn't like plain uuidgen passwords
         PLC_MONITOR_DBPASSWORD=$( uuidgen | md5sum - | awk '{print $1}' )
         plc-config --category=plc_monitor --variable=dbpassword --value="$PLC_MONITOR_DBPASSWORD" --save=$local_config $local_config
-        psql -d template1 -U postgres -c "ALTER USER $ZABBIX_DB_NAME WITH PASSWORD '$PLC_MONITOR_DBPASSWORD';"
         service plc reload
+		CREATED="true"
+    fi
+    if [ -n "$CREATED" ] ; then
+        psql -d template1 -U postgres -c "ALTER USER $ZABBIX_DB_USER WITH PASSWORD '$PLC_MONITOR_DBPASSWORD';"
     fi
 }
 
@@ -91,9 +97,7 @@ case "$1" in
 	MESSAGE=$"Bootstrap Monitoring"
 	dialog "$MESSAGE"
 
-	check_user_and_db 
-	check_schema_and_data
-        
+	#### SETUP ACCESS to this user and database
 	mkdir -p /var/lib/pgsql/data/pg_hba.conf.d
 	ZABCONF=/var/lib/pgsql/data/pg_hba.conf.d/zabbix.conf
 	if [ ! -f $ZABCONF ] ; then
@@ -101,6 +105,12 @@ case "$1" in
 		echo "host $ZABBIX_DB_NAME $ZABBIX_DB_USER $PLC_MONITOR_IP/32 password" >> $ZAB
 	fi
 
+	# NOTE: restart db to enable access by users granted above.
+	service plc restart posgresql
+
+	check_user_and_db 
+	check_schema_and_data
+
         # UPDATE /etc/zabbix/*.conf
 	ZABBIXCFG=/etc/zabbix
 	TMP_FILE=`mktemp /tmp/zbxtmpXXXXXX`
diff --git a/setup.py b/setup.py
index 421e673..0e4f001 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from distutils.core import setup
 #from setuptools import setup, find_packages
 
 packages=['monitor', 'monitor.database', 'monitor.database.zabbixapi', 
-		'monitor.database.infovacuum', 'monitor.database.infovacuum.model', 'monitor.pcu',
+		'monitor.database.infovacuum', 'monitor.pcu',
 		'monitor.sources', 'monitor.util', 'monitor.wrapper' ]
 
 #packages = find_packages(exclude=('Rpyc', 'www', 'ssh', 'pyssh',
diff --git a/zabbix.spec b/zabbix.spec
index fb7cb8c..3f2e548 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -195,6 +195,7 @@ TMP_FILE=`mktemp $TMPDIR/zbxtmpXXXXXX`
 sed	-e "s#AlertScriptsPath=/home/zabbix/bin/#AlertScriptsPath=%{zabbix_bindir}/#g" \
 	-e "s#PidFile=/var/tmp/zabbix_server.pid#PidFile=%{zabbix_piddir}/zabbix_server.pid#g" \
 	-e "s#LogFile=/tmp/zabbix_server.log#LogFile=%{zabbix_logdir}/zabbix_server.log#g" \
+	-e "s|#DBPassword|DBPassword|g" \
 	%{zabbix_confdir}/zabbix_server.conf > $TMP_FILE
 cat $TMP_FILE > %{zabbix_confdir}/zabbix_server.conf
 mkdir -p %{_sysconfdir}/zabbix
-- 
2.43.0