Author: Lars Michelsen <[email protected]>
Date: Thu Aug 25 19:04:21 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Thu Aug 25 19:04:21 2011 +0200
nagvis: Changed redirect syntax
---
.f12 | 43 ++++++++++++++++++++++++++++++++++++++++
etc/apache2-nagvis.conf-sample | 3 +-
2 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/.f12 b/.f12
new file mode 100755
index 0000000..94705c2
--- /dev/null
+++ b/.f12
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+SITE=${1-lancom}
+
+cd /d1/nagvis
+
+#
+# Install to /usr/local/nagvis
+#
+sudo ./install.sh -a y -q -r -F -c y \
+ -W /nagvis -n /usr/local/nagios \
+ -i mklivestatus -p /usr/local/nagvis \
+ -u www-data -g www-data \
+ -w /etc/apache2/conf.d \
+ -l unix:/omd/sites/muc/tmp/run/live
+sudo rm -f /etc/apache2/conf.d/nagvis.conf.*
+
+#
+# Install to omd site local/
+#
+sudo su - $SITE -c "[ ! -d /omd/sites/$SITE/nvsrc ] && mkdir
/omd/sites/$SITE/nvsrc ; \
+rsync --filter='- .git' -av /d1/nagvis/ /omd/sites/$SITE/nvsrc/ ; \
+cd /omd/sites/$SITE/nvsrc/ ; \
+yes y | ./omd_install.sh"
+
+#
+# Install to OMD default version
+#
+
+#sudo rsync -av /d1/nagvis/share/frontend/
/opt/omd/versions/default/share/nagvis/htdocs/frontend/
+#[ -f
/opt/omd/versions/default/share/nagvis/htdocs/frontend/nagvis-js/js/NagVisCompressed.js
] \
+# && sudo rm
/opt/omd/versions/default/share/nagvis/htdocs/frontend/nagvis-js/js/NagVisCompressed.js
+#[ -f
/opt/omd/versions/default/share/nagvis/htdocs/frontend/wui/js/WuiCompressed.js
] \
+# && sudo rm
/opt/omd/versions/default/share/nagvis/htdocs/frontend/wui/js/WuiCompressed.js
+#sudo rsync -av /d1/nagvis/share/server/core/ajax_handler.php
/opt/omd/versions/default/share/nagvis/htdocs/server/core/ajax_handler.php
+#sudo rsync -av /d1/nagvis/share/server/core/classes/
/opt/omd/versions/default/share/nagvis/htdocs/server/core/classes/
+#sudo rsync -av /d1/nagvis/share/server/core/functions/
/opt/omd/versions/default/share/nagvis/htdocs/server/core/functions/
+#sudo rsync -av /d1/nagvis/share/server/core/defines/matches.php
/opt/omd/versions/default/share/nagvis/htdocs/server/core/defines/
+##sudo rsync -av /d1/nagvis/share/userfiles/
/opt/omd/versions/default/skel/var/nagvis/userfiles/
+##sudo rsync -av /d1/nagvis/share/userfiles/
/opt/omd/sites/muc/var/nagvis/userfiles/
+#sudo rsync -av /d1/nagvis/share/userfiles/
/omd/sites/muc/share/nagvis/htdocs/userfiles/
+
+exit 0
diff --git a/etc/apache2-nagvis.conf-sample b/etc/apache2-nagvis.conf-sample
index 01d2e1d..0611874 100644
--- a/etc/apache2-nagvis.conf-sample
+++ b/etc/apache2-nagvis.conf-sample
@@ -39,8 +39,9 @@ Alias @NAGVIS_WEB@ "@NAGVIS_PATH@/share"
RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@/frontend/(wui|nagvis-js)
RewriteCond %{QUERY_STRING} map=(.*)
RewriteRule ^(.*)$
@NAGVIS_WEB@/frontend/nagvis-js/index.php?mod=Map&act=view&show=%1 [R=301,L]
+
# Without map= param
- RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@/frontend(/wui|)/?(index.php)?$
+ RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@/frontend(/wui)?/?(index.php)?$
RewriteRule ^(.*)$ @NAGVIS_WEB@/frontend/nagvis-js/index.php [R=301,L]
# Redirect old rotation calls
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
