From f6e775e877781d6ec3e462ed1c19c0801c5b43b3 Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Thu, 13 Nov 2008 22:09:07 +0000
Subject: [PATCH] minor updates to both files to fix bugs.

---
 Monitor.spec        |  4 +++-
 monitor-server.init | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Monitor.spec b/Monitor.spec
index 10360b2..48fe7c5 100644
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -81,7 +81,7 @@ cd ..
 %install
 rm -rf $RPM_BUILD_ROOT
 #################### CLIENT 
-install -D -m 755 monitor.init $RPM_BUILD_ROOT/%{_initrddir}/monitor
+install -D -m 755 monitor-client.init $RPM_BUILD_ROOT/%{_initrddir}/monitor
 install -D -m 644 monitor.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor
 
 #################### SERVER
@@ -92,6 +92,8 @@ install -d $RPM_BUILD_ROOT/var/lib/%{name}
 install -d $RPM_BUILD_ROOT/var/lib/%{name}/archive-pdb
 install -d $RPM_BUILD_ROOT/var/www/cgi-bin/monitor/
 
+install -D -m 755 monitor-server.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/monitor
+
 echo " * Installing core scripts"
 rsync -a --exclude www --exclude archive-pdb --exclude .svn --exclude CVS \
 	  ./ $RPM_BUILD_ROOT/usr/share/%{name}/
diff --git a/monitor-server.init b/monitor-server.init
index 451b65b..3451f1a 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -35,8 +35,8 @@ export PGPORT=$PLC_DB_PORT
 ###    add zabbix to pg_hba.conf
 ##   setup zabbix.conf.php 
 ##   
-DB_USER="zabbixuser"
-DB_NAME="zabbix"
+ZABBIX_DB_USER="zabbixuser"
+ZABBIX_DB_NAME="zabbix"
 
 function check_user_and_db()
 {
@@ -54,7 +54,8 @@ function check_user_and_db()
 
     # Create/update the unprivileged database user and password
     if [ -z "$PLC_MONITOR_DBPASSWORD" ] ; then
-        PLC_MONITOR_DBPASSWORD=$(uuidgen)
+        # 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
@@ -73,6 +74,7 @@ function check_schema_and_data()
 {
     schema_present=$( psql -U $ZABBIX_DB_USER $ZABBIX_DB_NAME -c "\d;" < /dev/null | grep hosts )
     if [ -z $schema_present ] ; then
+        echo "... initial import can take SEVERAL minutes. please wait ..."
         if_present_load "/usr/local/zabbix/misc/create/schema/postgresql.sql"
         if_present_load "/usr/local/zabbix/misc/create/data/data.sql"
         if_present_load "/usr/local/zabbix/misc/create/data/images_pgsql.sql"
@@ -108,7 +110,7 @@ case "$1" in
 		sed -e "s/#DBHost=.*/DBHost=$PLC_MONITOR_HOST/g" \
 		    -e "s#DBName=.*#DBName=$ZABBIX_DB_NAME#g" \
 		    -e "s#DBUser=.*#DBUser=$ZABBIX_DB_USER#g" \
-		    -e "s#DBPassword=.*#$PLC_MONITOR_DBPASSWORD#g" \
+		    -e "s#DBPassword=.*#DBPassword=$PLC_MONITOR_DBPASSWORD#g" \
 		    ${ZABBIXCFG}/zabbix_server.conf > $TMP_FILE
 		cat $TMP_FILE > ${ZABBIXCFG}/zabbix_server.conf
 	fi
-- 
2.43.0