From 10e86b7e09a71a4817f1d11f202d1686767bb574 Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 19 Sep 2016 14:03:28 +0300
Subject: [PATCH 01/14] Add ability to change sonar data location

---
 templates/sonar.properties.erb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/templates/sonar.properties.erb b/templates/sonar.properties.erb
index c3a0e1df..78b0ee32 100644
--- a/templates/sonar.properties.erb
+++ b/templates/sonar.properties.erb
@@ -204,6 +204,22 @@ sonar.jdbc.timeBetweenEvictionRunsMillis:  <% if @jdbc['time_between_eviction_ru
 
 <% end -%>
 
+#---------------------------------------------------------
+# DATA FILES PROPERTIES
+#---------------------------------------------------------
+
+# Paths to persistent data files (embedded database and search index) and temporary files.
+# Can be absolute or relative to installation directory.
+# Defaults are respectively <installation home>/data and <installation home>/temp
+
+<% if !@path.empty? -%>
+sonar.path.data: <% if @path['data'] %><%= @path['data'] %><% else %>data<% end %>
+sonar.path.temp: <% if @path['temp'] %><%= @path['data'] %><% else %>temp<% end %>
+<% else -%>
+#sonar.path.data=data
+#sonar.path.temp=temp
+<% end -%>
+
 #---------------------------------------------------------
 # UPDATE CENTER
 #---------------------------------------------------------

From 7eb62034179945aced776ab75ba2514226b77127 Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 19 Sep 2016 17:11:09 +0300
Subject: [PATCH 02/14] data_dir and temp_dir declaration

Adding ability to specify custom
directory for sonar data and temp
directory
---
 manifests/init.pp              | 61 ++++++++++++++++++++++++++++++++--
 templates/logback.xml.erb      |  8 ++---
 templates/sonar.properties.erb | 13 +++++---
 3 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 3a96b781..756b04eb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -19,6 +19,8 @@
   $service          = 'sonar',
   $installroot      = '/usr/local',
   $home             = undef,
+  $data_dir         = undef,
+  $temp_dir         = undef,
   $host             = undef,
   $port             = 9000,
   $portAjp          = -1,
@@ -42,7 +44,7 @@
     min_evictable_idle_time_millis    => '600000',
     time_between_eviction_runs_millis => '30000',
   },
-  $log_folder       = '/var/local/sonar/logs',
+  $log_folder       = undef,
   $updatecenter     = true,
   $http_proxy       = {},
   $profile          = false,
@@ -71,6 +73,19 @@
   } else {
     $real_home = '/var/local/sonar'
   }
+
+  if $data_dir != undef {
+    $real_data_dir = $data_dir
+  } else {
+    $real_data_dir = "${real_home}/data"
+  }
+
+  if $log_folder != undef {
+    $real_log_folder = $log_folder
+  } else {
+    $real_log_folder = '/var/local/sonar/logs'
+  }
+
   Sonarqube::Move_to_home {
     home => $real_home,
   }
@@ -125,8 +140,48 @@
     target => "${installroot}/${package_name}-${version}",
     notify => Service['sonarqube'],
   }
-  ->
-  sonarqube::move_to_home { 'data': }
+  if $data_dir != undef {
+    exec { 'create_data_dir':
+      command => "mkdir -p ${real_data_dir}",
+      creates => $real_data_dir,
+      require => File[$real_home],
+    }
+    ->
+    file { $real_data_dir:
+      ensure => directory,
+      owner  => $user,
+      group  => $group,
+    }
+  }
+  if $temp_dir != undef {
+    exec { 'create_temp_dir':
+      command => "mkdir -p ${temp_dir}",
+      creates => $temp_dir,
+      require => File[$real_home],
+    }
+    ->
+    file { $temp_dir:
+      ensure => directory,
+      owner  => $user,
+      group  => $group,
+    }
+  }
+  if $log_folder != undef {
+    exec { 'create_log_folder':
+      command => "mkdir -p ${real_log_folder}",
+      creates => $real_log_folder,
+      require => File[$real_home],
+    }
+    ->
+    file { $real_log_folder:
+      ensure => directory,
+      owner  => $user,
+      group  => $group,
+    }
+  }
+  sonarqube::move_to_home { 'data':
+    require => File[$real_home],
+  }
   ->
   sonarqube::move_to_home { 'extras': }
   ->
diff --git a/templates/logback.xml.erb b/templates/logback.xml.erb
index f583ee5f..56a87596 100644
--- a/templates/logback.xml.erb
+++ b/templates/logback.xml.erb
@@ -22,9 +22,9 @@
   <!-- SONAR_STANDALONE/ -->
   <!-- do not edit/remove the previous comment -->
   <appender name="SONAR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File><%= @log_folder %>/sonar.log</File>
+    <File><%= @real_log_folder %>/sonar.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <param name="FileNamePattern" value="<%= @log_folder %>/sonar.%i.log"/>
+      <param name="FileNamePattern" value="<%= @real_log_folder %>/sonar.%i.log"/>
       <param name="MinIndex" value="1"/>
       <param name="MaxIndex" value="3"/>
     </rollingPolicy>
@@ -48,9 +48,9 @@
   <!-- appender used to profile Sonar Server -->
   <%= "<!--" if !@profile %>
   <appender name="PROFILING_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File><%= @log_folder %>/profiling.log</File>
+    <File><%= @real_log_folder %>/profiling.log</File>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <param name="FileNamePattern" value="<%= @log_folder %>/profiling.%i.log"/>
+      <param name="FileNamePattern" value="<%= @real_log_folder %>/profiling.%i.log"/>
       <param name="MinIndex" value="1"/>
       <param name="MaxIndex" value="3"/>
     </rollingPolicy>
diff --git a/templates/sonar.properties.erb b/templates/sonar.properties.erb
index 78b0ee32..38927e41 100644
--- a/templates/sonar.properties.erb
+++ b/templates/sonar.properties.erb
@@ -212,13 +212,16 @@ sonar.jdbc.timeBetweenEvictionRunsMillis:  <% if @jdbc['time_between_eviction_ru
 # Can be absolute or relative to installation directory.
 # Defaults are respectively <installation home>/data and <installation home>/temp
 
-<% if !@path.empty? -%>
-sonar.path.data: <% if @path['data'] %><%= @path['data'] %><% else %>data<% end %>
-sonar.path.temp: <% if @path['temp'] %><%= @path['data'] %><% else %>temp<% end %>
+<% if !@data_dir.nil? -%>
+sonar.path.data: <%= @data_dir %>
 <% else -%>
-#sonar.path.data=data
-#sonar.path.temp=temp
+#sonar.path.data: data
 <% end -%>
+<% if !@temp_dir.nil? -%>
+sonar.path.temp: <%= @temp_dir %>
+<% else -%>
+#sonar.path.temp: temp
+<% end %>
 
 #---------------------------------------------------------
 # UPDATE CENTER

From 6f3c97f88c12f1fc91e38b914de9a8eb61baac8c Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Tue, 4 Oct 2016 12:18:47 +0300
Subject: [PATCH 03/14] move data_dir and temp_dir parameters to Hash

---
 manifests/init.pp              | 18 +++++++++++-------
 templates/sonar.properties.erb | 12 +++---------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 756b04eb..03b6845a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -53,6 +53,10 @@
   $search_host      = '127.0.0.1',
   $search_port      = '9001',
   $config           = undef,
+  $path             = {
+    data_dir        => undef,
+    temp_dir        => undef,
+  },
 ) inherits sonarqube::params {
   validate_absolute_path($download_dir)
   Exec {
@@ -74,8 +78,8 @@
     $real_home = '/var/local/sonar'
   }
 
-  if $data_dir != undef {
-    $real_data_dir = $data_dir
+  if $path[data_dir] != undef {
+    $real_data_dir = $path[data_dir]
   } else {
     $real_data_dir = "${real_home}/data"
   }
@@ -140,7 +144,7 @@
     target => "${installroot}/${package_name}-${version}",
     notify => Service['sonarqube'],
   }
-  if $data_dir != undef {
+  if $path[data_dir] != undef {
     exec { 'create_data_dir':
       command => "mkdir -p ${real_data_dir}",
       creates => $real_data_dir,
@@ -153,14 +157,14 @@
       group  => $group,
     }
   }
-  if $temp_dir != undef {
+  if $path[temp_dir] != undef {
     exec { 'create_temp_dir':
-      command => "mkdir -p ${temp_dir}",
-      creates => $temp_dir,
+      command => "mkdir -p ${path[temp_dir]}",
+      creates => $path[temp_dir],
       require => File[$real_home],
     }
     ->
-    file { $temp_dir:
+    file { $path[temp_dir]:
       ensure => directory,
       owner  => $user,
       group  => $group,
diff --git a/templates/sonar.properties.erb b/templates/sonar.properties.erb
index 38927e41..e32ee4c6 100644
--- a/templates/sonar.properties.erb
+++ b/templates/sonar.properties.erb
@@ -212,15 +212,9 @@ sonar.jdbc.timeBetweenEvictionRunsMillis:  <% if @jdbc['time_between_eviction_ru
 # Can be absolute or relative to installation directory.
 # Defaults are respectively <installation home>/data and <installation home>/temp
 
-<% if !@data_dir.nil? -%>
-sonar.path.data: <%= @data_dir %>
-<% else -%>
-#sonar.path.data: data
-<% end -%>
-<% if !@temp_dir.nil? -%>
-sonar.path.temp: <%= @temp_dir %>
-<% else -%>
-#sonar.path.temp: temp
+<% if !@path.empty? -%>
+<% if @path['data_dir'] %><%= "sonar.path.data: #{@path['data_dir']}" %><% end %>
+<% if @path['temp_dir'] %><%= "sonar.path.temp: #{@path['temp_dir']}" %><% end %>
 <% end %>
 
 #---------------------------------------------------------

From 7239939585f978c74c75a29236da70e484586951 Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 31 Oct 2016 16:45:16 +0200
Subject: [PATCH 04/14] Fix Travis warnings

---
 manifests/init.pp              | 5 +++--
 templates/sonar.properties.erb | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 03b6845a..f0e4c017 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -23,7 +23,7 @@
   $temp_dir         = undef,
   $host             = undef,
   $port             = 9000,
-  $portAjp          = -1,
+  $portajp          = -1,
   $download_url     = 'https://sonarsource.bintray.com/Distribution/sonarqube',
   $download_dir     = '/usr/local/src',
   $context_path     = '/',
@@ -195,7 +195,8 @@
   ->
   # ===== Install SonarQube =====
   exec { 'untar':
-    command => "unzip -o ${tmpzip} -d ${installroot} && chown -R ${user}:${group} ${installroot}/${package_name}-${version} && chown -R ${user}:${group} ${real_home}",
+    command => "unzip -o ${tmpzip} -d ${installroot} && chown -R \
+      ${user}:${group} ${installroot}/${package_name}-${version} && chown -R ${user}:${group} ${real_home}",
     creates => "${installroot}/${package_name}-${version}/bin",
     notify  => Service['sonarqube'],
   }
diff --git a/templates/sonar.properties.erb b/templates/sonar.properties.erb
index e32ee4c6..733d9c26 100644
--- a/templates/sonar.properties.erb
+++ b/templates/sonar.properties.erb
@@ -16,7 +16,7 @@ sonar.web.host:                           <%= @host %>
 #sonar.web.host:                           0.0.0.0
 <% end -%>
 sonar.web.port:                           <%= @port %>
-sonar.ajp.port:                           <%= @portAjp %>
+sonar.ajp.port:                           <%= @portajp %>
 <% if has_variable?('context_path') -%>
 sonar.web.context:                        <%= @context_path %>
 <% end -%>

From f211a5fb3c9b92f00495ae8e150bf45ce68b5d0d Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 31 Oct 2016 17:05:43 +0200
Subject: [PATCH 05/14] change beaker version

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 00f7641c..303934b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,7 +22,7 @@ GEM
     aws-sdk-v1 (1.63.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (2.4.1)
+    beaker (3.2.0)
       aws-sdk (~> 1.57)
       docker-api
       fission (~> 0.4)

From 3a4be0ce505c601c15aede2278cfae76afbcc757 Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 31 Oct 2016 17:14:28 +0200
Subject: [PATCH 06/14] change beaker version

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 303934b0..14290220 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,7 +22,7 @@ GEM
     aws-sdk-v1 (1.63.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (3.2.0)
+    beaker (2.50.0)
       aws-sdk (~> 1.57)
       docker-api
       fission (~> 0.4)

From 457f3e2aee2e6b745a800354db79b80e92540d55 Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 31 Oct 2016 17:24:16 +0200
Subject: [PATCH 07/14] change beaker version

---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index e99ec537..28572b18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,7 @@ gem 'puppet-lint', '>= 1.1.0', :require => false
 gem 'simplecov', :require => false
 gem 'puppet-blacksmith', '>= 3.3.1', :require => false
 gem 'librarian-puppet', '>= 2.0.0', :require => false
+gem 'beaker', '>=2.50.0', :require => false
 gem 'beaker-rspec', '>= 3.0.0', :require => false
 
 # vim:ft=ruby

From d928d2c5a3613dc64881c0391eba4f7c9105d368 Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 31 Oct 2016 18:24:51 +0200
Subject: [PATCH 08/14] revert useless changes

---
 Gemfile      | 1 -
 Gemfile.lock | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 28572b18..e99ec537 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,6 @@ gem 'puppet-lint', '>= 1.1.0', :require => false
 gem 'simplecov', :require => false
 gem 'puppet-blacksmith', '>= 3.3.1', :require => false
 gem 'librarian-puppet', '>= 2.0.0', :require => false
-gem 'beaker', '>=2.50.0', :require => false
 gem 'beaker-rspec', '>= 3.0.0', :require => false
 
 # vim:ft=ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index 14290220..00f7641c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,7 +22,7 @@ GEM
     aws-sdk-v1 (1.63.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (2.50.0)
+    beaker (2.4.1)
       aws-sdk (~> 1.57)
       docker-api
       fission (~> 0.4)

From 9bb03293f7e8a4e01cfdddc54b110d29e7dcf62c Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 31 Oct 2016 18:25:50 +0200
Subject: [PATCH 09/14] change Ruby version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 06f587eb..0d1c3a62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ before_install:
   - rm -f Gemfile.lock
 
 rvm:
-  - "2.0.0"
+  - "2.2.5"
 
 env:
   - PUPPET_VERSION="~> 3.7.0"

From 85bec167871ccb0e71c80a3e7136b449f6044429 Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 31 Oct 2016 18:32:32 +0200
Subject: [PATCH 10/14] add safe_yaml

---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index e99ec537..e9674706 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,5 +13,6 @@ gem 'simplecov', :require => false
 gem 'puppet-blacksmith', '>= 3.3.1', :require => false
 gem 'librarian-puppet', '>= 2.0.0', :require => false
 gem 'beaker-rspec', '>= 3.0.0', :require => false
+gem 'safe_yaml', '~> 1.0.4'
 
 # vim:ft=ruby

From a0813f7945c59f9741776e567c559556f2513de1 Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 31 Oct 2016 18:39:20 +0200
Subject: [PATCH 11/14] try ruby 2.3.1

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0d1c3a62..4e171845 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ before_install:
   - rm -f Gemfile.lock
 
 rvm:
-  - "2.2.5"
+  - "2.3.1"
 
 env:
   - PUPPET_VERSION="~> 3.7.0"

From 4d40374275e99441a9d2ac641d49a58cdb1e0c6e Mon Sep 17 00:00:00 2001
From: Yurii Rochniak <yurii.rochniak@tubemogul.com>
Date: Mon, 31 Oct 2016 18:47:36 +0200
Subject: [PATCH 12/14] remove tests where bundler fails

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4e171845..c0f778a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,6 @@ env:
   - PUPPET_VERSION="~> 3.6.0"
   - PUPPET_VERSION="~> 3.5.0"
   - PUPPET_VERSION="~> 3.4.0"
-  - PUPPET_VERSION="~> 3.3.0"
-  - PUPPET_VERSION="~> 3.2.0"
 
 matrix:
   exclude:
@@ -38,6 +36,10 @@ matrix:
       env: PUPPET_VERSION="~> 3.3.0"
     - rvm: 2.1.0
       env: PUPPET_VERSION="~> 3.4.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.2.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.3.0"
 
 deploy:
   provider: puppetforge

From 6abc558b028bad250bbc7695d985ac225dcaee2a Mon Sep 17 00:00:00 2001
From: ynnt <me@ynnt.online>
Date: Wed, 8 Feb 2017 15:30:50 +0200
Subject: [PATCH 13/14] Add default updatecenter url description

---
 manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index f0e4c017..39fd17ec 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -46,6 +46,7 @@
   },
   $log_folder       = undef,
   $updatecenter     = true,
+  $updatecenter_url = 'http://update.sonarsource.org/update-center.properties',
   $http_proxy       = {},
   $profile          = false,
   $web_java_opts    = undef,

From 8547579774f6d9f20549390e654e28e3c1166184 Mon Sep 17 00:00:00 2001
From: ynnt <me@ynnt.online>
Date: Wed, 8 Feb 2017 15:32:48 +0200
Subject: [PATCH 14/14] Use updatecenter_url variable from local scope in sonar
 cfg

---
 templates/sonar.properties.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/sonar.properties.erb b/templates/sonar.properties.erb
index 733d9c26..f4d0a84e 100644
--- a/templates/sonar.properties.erb
+++ b/templates/sonar.properties.erb
@@ -224,6 +224,7 @@ sonar.jdbc.timeBetweenEvictionRunsMillis:  <% if @jdbc['time_between_eviction_ru
 # The Update Center requires an internet connection to request http://update.sonarsource.org
 # It is activated by default:
 sonar.updatecenter.activate=<%= @updatecenter %>
+sonar.updatecenter.url=<%= @updatecenter_url %>
 
 <% if !@http_proxy.empty? -%>
 # HTTP proxy (default none)