X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor-server.init;h=c477c89a743ca458faa70b69028d5f871e6121e0;hb=f4c8ac6cb9e1418ced303fd9f715e76b275af00d;hp=f8e5a0228a5eddc3b131df6dd23698aef8dc83dd;hpb=7b3d462aa05fcc1892fd914db163143f36a05945;p=monitor.git

diff --git a/monitor-server.init b/monitor-server.init
index f8e5a02..c477c89 100644
--- a/monitor-server.init
+++ b/monitor-server.init
@@ -33,34 +33,46 @@ export PGPORT=$PLC_DB_PORT
 ZABBIX_DB_USER="zabbixuser"
 ZABBIX_DB_NAME="zabbix"
 
+MONITOR_DB_USER="monitoruser"
+MONITOR_DB_NAME="monitor"
+
+WROTE_PG_CONFIG=
+
+if [ -z "$PLC_MONITOR_IP" ] ; then
+	PLC_MONITOR_IP=$( gethostbyname $PLC_MONITOR_HOST )
+fi
+
 function check_pg_hba ()
 {
+	NAME=$1
+	USER=$2
 	#### SETUP ACCESS to this user and database
 	mkdir -p $PGDATA/pg_hba.conf.d
-	ZABCONF=$PGDATA/pg_hba.conf.d/zabbix.conf
-	if [ ! -f $ZABCONF ] ; then
-		echo "host $ZABBIX_DB_NAME $ZABBIX_DB_USER 127.0.0.1/32 password"   > $ZABCONF
-		echo "host $ZABBIX_DB_NAME $ZABBIX_DB_USER $PLC_MONITOR_IP/32 password" >> $ZABCONF
+	CONF=$PGDATA/pg_hba.conf.d/${NAME}.conf
+	if [ ! -f $CONF ] ; then
+		echo "host $NAME $USER 127.0.0.1/32 password"   > $CONF
+		echo "host $NAME $USER $PLC_MONITOR_IP/32 password" >> $CONF
 
-		# NOTE: restart db to enable access by users granted above.
-		service plc restart posgresql
+		WROTE_PG_CONFIG="true"
 	fi
 }
 
 function check_user_and_db()
 {
     CREATED=
+	NAME=$1
+	USER=$2
     # confirm user is present or create it
-    user_present=$( psql -U postgres -c "select * from pg_user;" -d template1 | grep $ZABBIX_DB_USER )
+    user_present=$( psql -U postgres -c "select * from pg_user;" -d template1 | grep $USER )
     if [ -z $user_present ] ; then 
-        createuser --no-superuser --no-createdb --no-createrole --login --unencrypted --echo $ZABBIX_DB_USER -U postgres
+        createuser --no-superuser --no-createdb --no-createrole --login --unencrypted --echo $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 )
+    db_present=$( psql -U postgres -c "select * from pg_database;" -d template1 | grep $NAME )
     if [ -z $db_present ] ; then
-        createdb --owner=$ZABBIX_DB_USER $ZABBIX_DB_NAME -U postgres
+        createdb --owner=$USER $NAME -U postgres
 		CREATED="true"
     fi
 
@@ -73,7 +85,7 @@ function check_user_and_db()
 		CREATED="true"
     fi
     if [ -n "$CREATED" ] ; then
-        psql -d template1 -U postgres -c "ALTER USER $ZABBIX_DB_USER WITH PASSWORD '$PLC_MONITOR_DBPASSWORD';"
+        psql -d template1 -U postgres -c "ALTER USER $USER WITH PASSWORD '$PLC_MONITOR_DBPASSWORD';"
     fi
 }
 
@@ -84,8 +96,13 @@ function if_present_load ()
         psql -d $ZABBIX_DB_NAME -U $ZABBIX_DB_USER < $file
     fi
 }
+function check_monitor_schema_and_data() 
+{
+	# NOTE: call create_all() to setup the database from the info model.
+	python -c "from monitor.database.info.model import *; from elixir import create_all; create_all()"
+}
 
-function check_schema_and_data() 
+function check_zabbix_schema_and_data() 
 {
     schema_present=$( psql -U $ZABBIX_DB_USER $ZABBIX_DB_NAME -c "\d;" < /dev/null | grep hosts )
     if [ -z $schema_present ] ; then
@@ -97,7 +114,7 @@ function check_schema_and_data()
     fi
 }
 
-function check_templates_and_import ()
+function check_zabbix_templates_and_import ()
 {
 	# LOG IN
 	COOKIE_FILE=/tmp/cookiejar.txt
@@ -141,9 +158,6 @@ function check_monitor_conf ()
 {
 	MONITOR_CONFIG=/etc/monitor.conf
 
-	if [ -z "$PLC_MONITOR_IP" ] ; then
-		PLC_MONITOR_IP=$( gethostbyname $PLC_MONITOR_HOST )
-	fi
 
 	# Using plcsh add default, monitor user
 	plcsh <<EOF &>/dev/null 
@@ -195,12 +209,15 @@ support_email=${PLC_MAIL_SUPPORT_ADDRESS}
 cc_email=
 
 [monitordatabase]
-monitor_dburi=postgres://monitoruser:${PLC_MONITOR_DBPASSWORD}@localhost:5432/monitor
-zabbix_dburi=postgres://zabbixuser:${PLC_MONITOR_DBPASSWORD}@localhost:5432/zabbix
+monitor_dburi=postgres://${MONITOR_DB_NAME}:${PLC_MONITOR_DBPASSWORD}@localhost:5432/${MONITOR_DB_NAME}
+zabbix_dburi=postgres://${ZABBIX_DB_USER}:${PLC_MONITOR_DBPASSWORD}@localhost:5432/${ZABBIX_DB_NAME}
 
 cachetime=60
 
+# Evaluated as true or false
 [commandline]
+cachecalls=True
+
 echo=False
 debug=False
 mail=True
@@ -214,6 +231,68 @@ EOF
 	fi
 }
 
+function create_httpd_conf ()
+{
+	MONITOR_HTTP_CONF=/etc/httpd/conf.d/monitorweb.conf
+
+	if [ ! -f ${MONITOR_HTTP_CONF} ] ; then
+		# note: we need to either start this script before httpd, or always
+		# restart httpd, since there's no way to know beyond file's existence
+		# whether the values have changed or not.
+		WROTE_HTTP_CONFIG="true"
+	fi
+
+	# TODO: make http port configurable.
+	# TODO: make proxy port configurable.
+
+	cat <<EOF > ${MONITOR_HTTP_CONF}
+NameVirtualHost ${PLC_MONITOR_IP}:80
+
+<VirtualHost ${PLC_MONITOR_IP}:80>
+    ServerName ${PLC_MONITOR_HOST}
+    ServerAdmin ${PLC_MONITOR_EMAIL}
+    UseCanonicalName Off
+    ServerSignature Off
+
+    DocumentRoot ${MONITORPATH}/web/MonitorWeb/monitorweb
+
+    <Directory "${MONITORPATH}/web/MonitorWeb/monitorweb">
+        Options Indexes FollowSymLinks
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+    </Directory>
+
+    #LogLevel debug
+    Errorlog /var/log/httpd/monitorwebapp-error_log
+    Customlog /var/log/httpd/monitorwebapp-access_log common
+
+    AddDefaultCharset utf-8
+
+    #NOTE: This doesn't work as expected.
+    #	Load everything out of the DocumentRoot that is static
+    #	ProxyPass /monitor/static !
+
+    ProxyPass /tg_js http://127.0.0.1:8080/tg_js
+    ProxyPassReverse /tg_js http://127.0.0.1:8080/tg_js
+
+    ProxyPass /monitor http://127.0.0.1:8080
+    ProxyPassReverse /monitor http://127.0.0.1:8080
+
+    ProxyPreserveHost On
+    ProxyRequests Off
+
+</VirtualHost>
+EOF
+}
+
+function start_tg_server ()
+{
+	pushd ${MONITORPATH}/web/MonitorWeb/
+	./start-monitorweb.py ${MONITORPATH}/web/MonitorWeb/prod.cfg &> /var/log/monitorweb.log
+	popd
+}
+
 function check_zab_server ()
 {
 	ZABBIXCFG=/etc/zabbix
@@ -224,6 +303,7 @@ function check_zab_server ()
 		    -e "s#DBName=.*#DBName=$ZABBIX_DB_NAME#g" \
 		    -e "s#DBUser=.*#DBUser=$ZABBIX_DB_USER#g" \
 		    -e "s#DBPassword=.*#DBPassword=$PLC_MONITOR_DBPASSWORD#g" \
+		    -e "s/.*ExternalScripts=.*/ExternalScripts=${MONITORPATH}\/zabbix/g" \
 		    ${ZABBIXCFG}/zabbix_server.conf > $TMP_FILE
 		cat $TMP_FILE > ${ZABBIXCFG}/zabbix_server.conf
 	fi
@@ -280,20 +360,38 @@ case "$1" in
 		dialog "$MESSAGE"
 
 		# DATABASE acces, creation, and data loading
-		check_pg_hba
-		check_user_and_db 
-		check_schema_and_data
-		check_templates_and_import
+		check_pg_hba $MONITOR_DB_NAME $MONITOR_DB_USER
+		check_user_and_db $MONITOR_DB_NAME $MONITOR_DB_USER
+		check_monitor_schema_and_data
+
+		check_pg_hba $ZABBIX_DB_NAME $ZABBIX_DB_USER
+		check_user_and_db $ZABBIX_DB_NAME $ZABBIX_DB_USER
+
+		if [ -n "$WROTE_PG_CONFIG" ] ; then
+			# NOTE: restart db to enable access by users granted above.
+			service plc restart postgresql
+			service plc restart httpd
+		fi
+
+		check_zabbix_schema_and_data
+		check_zabbix_templates_and_import
 
 		# WRITE default /etc/monitor.conf
 		check_monitor_conf
 
+		# create /etc/httpd/conf.d/monitorweb.conf
+		create_httpd_conf
+		if [ -n "$WROTE_HTTP_CONFIG" ] ; then
+			# NOTE: restart web server to enable access web cfg
+			service plc restart httpd
+		fi
+		start_tg_server
+
 		# START zabbix services.  SETUP default config files.
 		check_zab_server
 		check_zab_agentd
 		check_zab_webconfig
 
-
 		result "$MESSAGE"
 	;;
 
@@ -306,7 +404,7 @@ case "$1" in
 
 		$MONITORPATH/zabbix/zabbixsync.py --setupglobal &> /var/log/monitor-server
 		# import any templates
-		check_templates_and_import
+		check_zabbix_templates_and_import
 
 		service plc start monitor