Module: nagvis Branch: master Commit: 186cc47d103226cab05c017b413d2b5b5ddeb267 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=186cc47d103226cab05c017b413d2b5b5ddeb267
Author: LaMi <[email protected]> Date: Fri Mar 12 18:01:04 2010 +0100 Updated apache sample configuration; Installer also replaces the NAGIOS_PATH macro in webserver configuration file in 1.5 again --- etc/apache2-nagvis.conf-sample | 30 +++++++++++++++--------------- install.sh | 8 ++------ 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/etc/apache2-nagvis.conf-sample b/etc/apache2-nagvis.conf-sample index 21bb77a..55af2a8 100644 --- a/etc/apache2-nagvis.conf-sample +++ b/etc/apache2-nagvis.conf-sample @@ -5,21 +5,21 @@ Alias @NAGVIS_WEB@ "@NAGVIS_PATH@/share" <Directory "@NAGVIS_PATH@/share"> -# SSLRequireSSL - Options FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all -# Order deny,allow -# Deny from all -# Allow from 127.0.0.1 + Options FollowSymLinks + AllowOverride None + Order allow,deny + Allow from all -# Deprecated basic auth -# Commented out in NagVis 1.5 -# -# AuthName "NagVis Access" -# AuthType Basic -# AuthUserFile @NAGIOS_PATH@/etc/htpasswd.users -# Require valid-user + # To enable Nagios basic auth on NagVis use the following options + # Just uncomment it. Maybe you need to adjust the path to the + # Auth user file. + # + # If you use the NagVis internal auth mechanism based on the web + # for you won't need this. + # + #AuthName "NagVis Access" + #AuthType Basic + #AuthUserFile @NAGIOS_PATH@/etc/htpasswd.users + #Require valid-user </Directory> diff --git a/install.sh b/install.sh index 6cf5aed..ef0a01a 100755 --- a/install.sh +++ b/install.sh @@ -1295,12 +1295,8 @@ if [ -f $NAGVIS_PATH/$HTML_SAMPLE ]; then fi DONE=`log "Creating web configuration file..." done` - # NagVis 1.5 and above does not need the NAGIOS_PATH var anymore - if [ $NAGVIS_TAG -ge 01050000 ]; then - cat $NAGVIS_PATH/$HTML_SAMPLE | $SED "s...@nagvis_path@#$NAGVIS_PATH#g;s...@nagvis_web@#$HTML_PATH#g;$CHG" > $WEB_PATH/$HTML_CONF - else - cat $NAGVIS_PATH/$HTML_SAMPLE | $SED "s...@nagios_path@#$NAGIOS_PATH#g;s...@nagvis_path@#$NAGVIS_PATH#g;s...@nagvis_web@#$HTML_PATH#g;$CHG" > $WEB_PATH/$HTML_CONF - fi + # Replace macros in sample configuration file + cat $NAGVIS_PATH/$HTML_SAMPLE | $SED "s...@nagios_path@#$NAGIOS_PATH#g;s...@nagvis_path@#$NAGVIS_PATH#g;s...@nagvis_web@#$HTML_PATH#g;$CHG" > $WEB_PATH/$HTML_CONF chk_rc "| Error creating web configuration" "$DONE" DONE=`log "Setting permissions for web configuration file..." done` chown $WEB_USER:$WEB_GROUP $WEB_PATH/$HTML_CONF ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
