Jenkins updates

example42 · Jul 13, 2018 · 0dc056b · 0dc056b
1 parent 031d68c
commit 0dc056b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/manifests/jenkins/plugin.pp b/manifests/jenkins/plugin.pp
@@ -4,7 +4,8 @@
   String $version               = 'latest',
   String $jenkins_dir           = '/var/lib/jenkins',
   String $jenkins_url           = 'http://updates.jenkins-ci.org',
-  String $install_script_source = 'puppet:///modules/psick/jenkins/install_jenkins_plugin.sh',
+  Optional[String] $install_script_source   = undef,
+  Optional[String] $install_script_template = 'psick/jenkins/install_jenkins_plugin.sh.epp',
   Boolean $enable               = true,
   String $jenkins_user          = 'jenkins',
   String $jenkins_group         = 'jenkins',
@@ -24,12 +25,14 @@
     }
   }
   if (!defined(File["${jenkins_dir}/install_jenkins_plugin.sh"])) {
+    $install_script_content = pick_default(psick::template($install_script_template),undef)
     file { "${jenkins_dir}/install_jenkins_plugin.sh":
-      ensure => present,
-      owner  => $jenkins_user,
-      group  => $jenkins_group,
-      mode   => '0750',
-      source => $install_script_source,
+      ensure  => present,
+      owner   => $jenkins_user,
+      group   => $jenkins_group,
+      mode    => '0750',
+      source  => $install_script_source,
+      content => $install_script_content,
     }
   }
 

diff --git a/files/jenkins/install_jenkins_plugin.sh → ...tes/jenkins/install_jenkins_plugin.sh.epp b/files/jenkins/install_jenkins_plugin.sh → ...tes/jenkins/install_jenkins_plugin.sh.epp