Fixes #74 : define an unknown value for the confluence version rather…

… than relying on its existance

CHANGELOG.md

@@ -1,3 +1,7 @@
+## To be released
+
+* Fixed issue with a clean puppet 4 based install failure.
+
 ## 2016-05-08 Release 2.2.1
 
 * delete the .pmtignore (is redundant with our .gitignore)

CONTRIBUTORS

@@ -2,3 +2,4 @@ Merritt Krakowitzer
 Bruce Morrison
 gerhardsam
 Jaco van Tonder
+Jonathan Gray

manifests/init.pp

@@ -83,7 +83,7 @@
 
   $webappdir    = "${installdir}/atlassian-${product}-${version}"
 
-  if $::confluence_version {
+  if $::confluence_version and $::confluence_version != 'unknown' {
     # If the running version of CONFLUENCE is less than the expected version of CONFLUENCE
     # Shut it down in preparation for upgrade.
     if versioncmp($version, $::confluence_version) > 0 {

templates/facts.sh.erb

@@ -5,9 +5,14 @@
 # This is the best I can come up with right now. It needs to be replaced
 # with a better solution.
 #
-# Facts: 
+# Facts:
 #   - confluence_version
 #
 #VERSION=`ps -ef|grep Dcatalina.home=| egrep -o 'Dcatalina.home=.*([0-9.]{1,}) '|grep -o '......$'|tr -d '[[:space:]]'|grep -Po '(?<=divider-bin-)[^;]+'`
 VERSION=`ps -ef|grep Dcatalina.home=| egrep -o 'Dcatalina.home=.*atlassian-confluence-([0-9.]{1,}) '| perl -pe '($_)=/([0-9]+([.][0-9]+)+)/'`
-echo "confluence_version=${VERSION}"
+if [[ -z "$VERSION" ]]
+then
+  echo "confluence_version=unknown";
+else
+  echo "confluence_version=${VERSION}";
+fi