fi
# Create/update the unprivileged database user and password
- if [ -z "$PLC_MONITOR_DBPASSWORD" || "$PLC_MONITOR_DBPASSWORD" = "None" ] ; then
+ if [[ -z "$PLC_MONITOR_DBPASSWORD" || "$PLC_MONITOR_DBPASSWORD" = "None" ]] ; then
# 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
# Evaluated as true or false
[commandline]
cachecalls=True
+embedded=False
echo=False
debug=False
# non-ssl session as non-ssl. But it works.
# NOTE: redirect path without trailing '/' to path with. Favor SSL.
-Redirect /monitor https://${MONITOR_HOSTNAME}:${PLC_WWW_SSL_PORT}/monitor/
+Redirect /monitor https://${PLC_MONITOR_HOST}:${PLC_WWW_SSL_PORT}/monitor/
# NOTE: this directive strips '/monitor/' from the requested path and pastes
# the remaining part to the end of the ProxyPass url below. All TG urls
#Errorlog /var/log/httpd/monitorwebapp-error_log
#Customlog /var/log/httpd/monitorwebapp-access_log common
- ProxyPass http://127.0.0.1:8080/
- ProxyPassReverse http://127.0.0.1:8080/
+ ProxyPass http://127.0.0.1:8082/
+ ProxyPassReverse http://127.0.0.1:8082/
</Location>
EOF
function start_tg_server ()
{
+ stop_tg_server
pushd ${MONITORPATH}/web/MonitorWeb/
./start-monitorweb.py ${MONITORPATH}/web/MonitorWeb/prod.cfg &> /var/log/monitorweb.log &
popd
check_user_and_db $MONITOR_DB_NAME $MONITOR_DB_USER
# WRITE default /etc/monitor.conf
check_monitor_conf
- check_monitor_schema_and_data
- check_pg_hba $ZABBIX_DB_NAME $ZABBIX_DB_USER
- check_user_and_db $ZABBIX_DB_NAME $ZABBIX_DB_USER
+ #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.
dialog "$MESSAGE"
fi
- check_zabbix_schema_and_data
- check_zabbix_templates_and_import
+ check_monitor_schema_and_data
+
+ #check_zabbix_schema_and_data
+ #check_zabbix_templates_and_import
# create /etc/httpd/conf.d/monitorweb.conf
start_tg_server
# START zabbix services. SETUP default config files.
- check_zab_server
- check_zab_agentd
- check_zab_webconfig
+ #check_zab_server
+ #check_zab_agentd
+ #check_zab_webconfig
result "$MESSAGE"
;;
# turn off zabbix server, etc. before writing to the db.
service plc stop monitor
- $MONITORPATH/zabbix/zabbixsync.py --setupglobal &> /var/log/monitor-server
+ $MONITORPATH/zabbix/zabbixsync.py --setupids &> /var/log/monitor-server
+ $MONITORPATH/zabbix/zabbixsync.py --setupglobal 2>&1 >> /var/log/monitor-server
# import any templates
check_zabbix_templates_and_import
result "$MESSAGE"
;;
+ delete)
+ MESSAGE=$"Deleting databases..."
+ dialog "$MESSAGE"
+
+ #dropdb -U postgres $ZABBIX_DB_NAME
+ #dropuser -U postgres $ZABBIX_DB_USER
+
+ dropdb -U postgres $MONITOR_DB_NAME
+ dropuser -U postgres $MONITOR_DB_USER
+
+ result "$MESSAGE"
+ ;;
+
stop)
MESSAGE=$"Stopping Monitor"
dialog "$MESSAGE"
stop_tg_server
- service zabbix_server stop
- service zabbix_agentd stop
+ #service zabbix_server stop
+ #service zabbix_agentd stop
# TODO: is there anything to stop?
result "$MESSAGE"
;;