Author: Lars Michelsen <[email protected]>
Date: Wed May 25 20:44:20 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Wed May 25 20:44:20 2011 +0200
Updated installer docs; Added short doc for new omd site install
---
docs/en_US/installation_instructions.html | 2 +-
docs/en_US/installer.html | 6 +++---
docs/en_US/toc.html | 1 +
docs/en_US/update_instructions.html | 9 ++++-----
install.sh | 6 +++---
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/docs/en_US/installation_instructions.html
b/docs/en_US/installation_instructions.html
index d886fd7..e371403 100644
--- a/docs/en_US/installation_instructions.html
+++ b/docs/en_US/installation_instructions.html
@@ -17,7 +17,7 @@
Get NagVis, the latest release can be found at <a
href=www.nagvis.org>www.nagvis.org</a>.
<h2> STEP 2: Unpack NagVis </h2>
- <pre>tar xvzf nagvis-1.5.x.tar.gz</pre>
+ <pre>tar xvzf nagvis-1.6.x.tar.gz</pre>
<h2> STEP 3: Move the unpacked NagVis directory </h2>
<p>Place the NagVis directory tree somewhere on your system. For most
case
diff --git a/docs/en_US/installer.html b/docs/en_US/installer.html
index f131822..6ef186f 100644
--- a/docs/en_US/installer.html
+++ b/docs/en_US/installer.html
@@ -19,8 +19,8 @@
<h3>Unpack NagVis</h3>
<p>Unpack the archive to a temporary place (For example /tmp). And
change to that directory</p>
- <pre>tar xvzf nagvis-1.5*.tar.gz /tmp
-cd /tmp/nagvis-1.5*</pre>
+ <pre>tar xvzf nagvis-1.6*.tar.gz /tmp
+cd /tmp/nagvis-1.6*</pre>
<h3>Make installer executable</h3>
<p>The installer is located in the root directory of the NagVis
package. The installer has to be made executable before you can use it.</p>
@@ -33,7 +33,7 @@ cd /tmp/nagvis-1.5*</pre>
<h3>Cleanup</h3>
<p>You can remove the sources after installation.</p>
- <pre>rm -rf /tmp/nagvis-1.5*</pre>
+ <pre>rm -rf /tmp/nagvis-1.6*</pre>
<h2>Command line parameters</h2>
<p>For details about the command line parameters call the installer
with the "-h" option.</p>
diff --git a/docs/en_US/toc.html b/docs/en_US/toc.html
index cab6cd8..040b94d 100644
--- a/docs/en_US/toc.html
+++ b/docs/en_US/toc.html
@@ -24,6 +24,7 @@
<dd><a href="installer.html" target="Main"><strong>NagVis
Installer</strong></a></dd>
<dd><a href="installation_instructions.html"
target="Main"><strong>Manual Installation</strong></a></dd>
<dd><a href="update_instructions.html"
target="Main"><strong>Manual Update</strong></a></dd>
+ <dd><a href="install_omd_site.html"
target="Main"><strong>Install into OMD site</strong></a></dd>
<dd><a href="after_installation.html"
target="Main"><strong>After Installation</strong></a></dd>
<dt><br /><strong>Interfaces</strong></dt>
diff --git a/docs/en_US/update_instructions.html
b/docs/en_US/update_instructions.html
index 1a9bce0..5a1602c 100644
--- a/docs/en_US/update_instructions.html
+++ b/docs/en_US/update_instructions.html
@@ -12,7 +12,7 @@
There are several cases for updating:
<ol>
<li> Upgrading from a very old major version (1.1x, 1.2x, 1.3x)</li>
- <li> Upgrading from the last major version (1.4x)</li>
+ <li> Upgrading from the last major versions (1.4x and 1.5x)</li>
<li> Updating the sub version (1.5x to 1.5x)</li>
</ol>
@@ -45,8 +45,7 @@
<p>From NagVis 1.4x to NagVis 1.5x we changed a lot in the directory
structure.
But in the newest NagVis version there is an installer script included for
installing
- NagVis. This script can also upgrade NagVis 1.4x versions and update 1.5x
versions
- to the latest 1.5x release.<br />
+ NagVis. This script can also upgrade NagVis 1.4x versions and newer to the
latest NagVis release.<br />
So it is recommended to use this script (<code>install.sh</code>)
distributed with the
newest NagVis version to upgrade your installation.</p>
@@ -56,13 +55,13 @@
permissions are stored as dump in the nagvis/etc/auth-backup file. With
this information
you can re-apply the permissions to your maps using the new role based
permission system.</p>
- <p>It is possible to perform the 1.4x to 1.5x update manually too but it
has not been
+ <p>It is possible to perform the 1.4x to 1.5x (or newer) update manually
too but it has not been
tested and documented by anyone. So if you like to update your installation
manually
you will need to do some research.
Basically it should be the same as described above (copying custom files to
the new
locations and merging your settings into nagvis.ini.php. <font
color="#ff0000">Don't</font> copy this file!).</p>
- <p>Once you made some experience in updating NagVis 1.4x to 1.5 manually
please let us know
+ <p>Once you made some experience in updating NagVis 1.4x to 1.5 or 1.6
manually please let us know
so that we can extend this documentation.</p>
</body>
diff --git a/install.sh b/install.sh
index 813c9d8..33978ac 100755
--- a/install.sh
+++ b/install.sh
@@ -123,7 +123,7 @@ General Parameters:
-O <PATH> Path to the old NagVis base directory to update from.
You only need to set this if it is different than the new
NagVis base
directory given in "-p". This may be useful when updating from
1.4
- to 1.5 where the paths to NagVis changed.
+ to 1.6 where the paths to NagVis changed.
Default value: $NAGVIS_PATH
-W <PATH> Web path to the NagVis base directory
Default: $HTML_PATH
@@ -1580,7 +1580,7 @@ if [ "$INSTALLER_ACTION" = "update" -a "$NAGVIS_VER_OLD"
!= "UNKNOWN" -a "$INSTA
text "| Handling changed/removed options" "|"
line
- # Only perform the actions below for NagVis 1.5.x installations
+ # Only perform the actions below for NagVis 1.5.x or newer installations
if [ $NAGVIS_TAG -ge 01050000 ]; then
DONE=`log "Removing allowedforconfig option from main
config..." done`
sed -i '/^allowedforconfig=/d' $NAGVIS_PATH/etc/nagvis.ini.php
@@ -1701,7 +1701,7 @@ text "| For later update/upgrade you may use this command
to have a faster updat
text "| $CALL"
text
if [ "$INSTALLER_ACTION" = "update" ] && [ $NAGVIS_TAG_OLD -lt 01050000 ]; then
-text "| 1.4 to 1.5x upgrade: The map permissions have ben reset. Old
permissions" "|"
+text "| 1.4 to 1.6x upgrade: The map permissions have ben reset. Old
permissions" "|"
text "| have been backed up in nagvis/etc/auth-backup file. You need to
migrate" "|"
text "| these permissions manually using using the new user/role management
GUI." "|"
text
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
