X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.init;h=4da26c4efbfa6390d29c46a25b479977cfc71c9a;hb=59a5e97c767a90437946aa3aca0c8518df662084;hp=451b65b18cfab4223e66b3390272677a727ebd27;hpb=03f339edc8521e36a12bfc1cdfd1b1a6ea3ab2d8;p=monitor.git

diff --git a/monitor-server.init b/monitor-server.init
index 451b65b..4da26c4 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -35,29 +35,36 @@ 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()
 {
+    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
     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
+		CREATED="true"
+    fi
+    if [ -n "$CREATED" ] ; then
+        psql -d template1 -U postgres -c "ALTER USER $ZABBIX_DB_USER WITH PASSWORD '$PLC_MONITOR_DBPASSWORD';"
     fi
 }
 
@@ -73,6 +80,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"
@@ -89,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
@@ -99,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`
@@ -108,7 +120,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