[omd-commits] OMD Git: omd: NagVis: Updated to current nightly build; removed deprecated var/nagvis/userfiles directory

git version control git at mathias-kettner.de
Thu Sep 11 14:28:01 CEST 2014


Module:   omd
Branch:   master
Commit:   5375afa649d7b70ed0e7115e27db2b7a2c9adc94
URL:      http://omdistro.org/projects/omd/repository/revisions/5375afa649d7b70ed0e7115e27db2b7a2c9adc94

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Sep 11 13:42:37 2014 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Thu Sep 11 13:42:37 2014 +0200

NagVis: Updated to current nightly build; removed deprecated var/nagvis/userfiles directory

---

 Changelog                                 |   14 ++++++++++++++
 packages/nagvis/Makefile                  |   17 -----------------
 packages/nagvis/nagvis-1.8-nightly.tar.gz |  Bin 1485412 -> 1486902 bytes
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Changelog b/Changelog
index d0ddf8d..e12f842 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,20 @@
 This file documents the revision history for the Open Monitoring Distribution
 
 1.30
+          - NagVis:
+            - Update to current nightly build
+            - Removed deprecated directory var/nagvis/userfiles. This was
+	      deprecated since version 0.52. During the update to 1.30, the
+	      directory and all its contents will be removed. This should be
+	      no problem for most users, because the directory is not used
+	      anymore since a long time.
+	      If you update from OMD 0.52 or below, you need to manually backup
+	      files from var/nagvis/userfiles and copy them to 
+	      local/share/nagvis/htdocs/userfiles after the update to make them
+	      available again.
+	      Note: If you decide to downgrade from this or a following
+	      version to version 0.52 or older, you will again need to care
+	      about these files manually.
 
 1.20     Aug 25 2014
           - apache: Changed order of apache daemon startup/stopping
diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile
index 923bd57..7d0f044 100644
--- a/packages/nagvis/Makefile
+++ b/packages/nagvis/Makefile
@@ -48,23 +48,6 @@ install:
 	# Delete files/directories we do not want to pack
 	rm -rf $(DESTDIR)$(OMD_ROOT)/share/nagvis/var
 	rm -rf $(DESTDIR)$(OMD_ROOT)/share/nagvis/etc
-	
-	# Update from NagVis 1.5 -> 1.6 in OMD handling needs to be handled here
-	# The var/userfiles directory is not part of 1.6 anymore. But if the packe
-	# would not contain var/nagvis/userfiles directories the "omd update" would remove
-	# the directory tree, even if there are some custom files in it. This looks
-	# like a bug in OMD. But to have a quick solution we simply create the empty
-	# directory structure here for some versions. Can be removed someday...
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/nagvis/userfiles/gadgets
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/nagvis/userfiles/images/gadgets
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/nagvis/userfiles/images/shapes
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/nagvis/userfiles/images/iconsets
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/nagvis/userfiles/images/maps
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/nagvis/userfiles/images/templates
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/nagvis/userfiles/styles
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/nagvis/userfiles/sounds
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/skel/var/nagvis/userfiles/templates
-
 
 clean:
 	rm -rf $(NAME)-*.*.[0-9] $(NAME)-*.*-nightly
diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz
index 7a0aa8d..58f5fd6 100644
Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ



More information about the omd-commits mailing list