Merge pull request #42 from maestrodev/feature/properly_clean_up_old_versions_of_plugins_and_sonarqube

Properly cleanup old versions of SonarQube and plugins

Author: racodond

manifests/init.pp

@@ -125,7 +125,7 @@
   sonarqube::move_to_home { 'extensions': } ->
   sonarqube::move_to_home { 'logs': } ->
 
-  # ===== Install Sonar =====
+  # ===== Install SonarQube =====
 
   exec { 'untar':
     command => "unzip -o ${tmpzip} -d ${installroot} && chown -R ${user}:${group} ${installroot}/${package_name}-${version} && chown -R ${user}:${group} ${real_home}",
@@ -159,6 +159,21 @@
     }
   }
 
+  file { '/tmp/cleanup-old-plugin-versions.sh':
+    content => template("${module_name}/cleanup-old-plugin-versions.sh.erb"),
+    mode    => '0755',
+  }
+  ->
+  file { '/tmp/cleanup-old-sonarqube-versions.sh':
+    content => template("${module_name}/cleanup-old-sonarqube-versions.sh.erb"),
+    mode    => '0755',
+  }
+  ->
+  exec { 'remove-old-versions-of-sonarqube':
+    command => "/tmp/cleanup-old-sonarqube-versions.sh ${installroot} ${version}",
+    path    => '/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin',
+  }
+
   # The plugins directory. Useful to later reference it from the plugin definition
   file { $plugin_dir:
     ensure => directory,

manifests/plugin.pp

@@ -36,8 +36,9 @@
       before     => File[$plugin],
       require    => File[$sonarqube::plugin_dir],
     }
+    ->
     exec { "remove-old-versions-of-${artifactid}":
-      command => "rm -f ${sonarqube::plugin_dir}/${artifactid}*.jar",
+      command => "/tmp/cleanup-old-plugin-versions.sh ${sonarqube::plugin_dir} ${artifactid} ${version}",
       path    => '/usr/bin:/usr/sbin:/bin:/sbin:/usr/local/bin',
     }
     ->

templates/cleanup-old-plugin-versions.sh.erb

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+pushd $1
+for file in $(ls | grep $2)
+do
+  if [ "$file" != "$2-$3.jar" ]
+  then
+      rm -f "$file"
+  fi
+done
+popd

templates/cleanup-old-sonarqube-versions.sh.erb

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+pushd $1
+for directory in $(ls | grep "sonarqube-")
+do
+  if [ "$directory" != "sonarqube-$2" ]
+  then
+      rm -rf "$directory"
+  fi
+done
+popd

templates/sonar.sh.erb

@@ -20,8 +20,8 @@
 #-----------------------------------------------------------------------------
 # These settings can be modified to fit the needs of your application
 
-# Default values for the Application variables, below. 
-# 
+# Default values for the Application variables, below.
+#
 # NOTE: The build for specific applications may override this during the resource-copying
 # phase, to fill in a concrete name and avoid the use of the defaults specified here.
 DEF_APP_NAME="sonar"
@@ -313,7 +313,7 @@ checkUser() {
                 exit 1
             fi
         fi
-    
+
         if [ "`$IDEXE -u -n`" = "$RUN_AS_USER" ]
         then
             # Already running as the configured user.  Avoid password prompts by not calling su.
@@ -330,7 +330,7 @@ checkUser() {
         then
             if [ "X$1" != "X" ]
             then
-                # Resolve the primary group 
+                # Resolve the primary group
                 RUN_AS_GROUP=`groups $RUN_AS_USER | awk '{print $3}' | tail -1`
                 if [ "X$RUN_AS_GROUP" = "X" ]
                 then
@@ -416,7 +416,7 @@ console() {
         exit 1
     fi
 }
- 
+
 start() {
     echo "Starting $APP_LONG_NAME..."
     getpid
@@ -435,9 +435,9 @@ start() {
         echo "Started $APP_LONG_NAME."
     else
         echo "Failed to start $APP_LONG_NAME."
-    fi    
+    fi
 }
- 
+
 stopit() {
     echo "Stopping $APP_LONG_NAME..."
     getpid