Skip to content

Instantly share code, notes, and snippets.

@nicobrevin
Created May 18, 2014 21:35
Show Gist options
  • Save nicobrevin/9b01b1b5a36859158217 to your computer and use it in GitHub Desktop.
Save nicobrevin/9b01b1b5a36859158217 to your computer and use it in GitHub Desktop.
diff --git a/modules/jenkins/manifests/cli.pp b/modules/jenkins/manifests/cli.pp
index ca44571..e4d1233 100644
--- a/modules/jenkins/manifests/cli.pp
+++ b/modules/jenkins/manifests/cli.pp
@@ -8,17 +8,26 @@ class jenkins::cli {
fail("Use of private class ${name} by ${caller_module_name}")
}
- $jar = '/usr/lib/jenkins/jenkins-cli.jar'
- $extract_jar = 'unzip /usr/lib/jenkins/jenkins.war WEB-INF/jenkins-cli.jar'
- $move_jar = "mv WEB-INF/jenkins-cli.jar ${jar}"
- $remove_dir = 'rm -rf WEB-INF'
+ # XXX probably want a version constraint in here
+ if $::osfamily == 'Debian' {
+ package { 'jenkins-cli':
+ ensure => $::jenkins::version,
+ }
+ }
+ else {
+ $jar = '/usr/lib/jenkins/jenkins-cli.jar'
+ $extract_jar = 'unzip /usr/lib/jenkins/jenkins.war WEB-INF/jenkins-cli.jar'
+ $move_jar = "mv WEB-INF/jenkins-cli.jar ${jar}"
+ $remove_dir = 'rm -rf WEB-INF'
- exec { 'jenkins-cli' :
- command => "${extract_jar} && ${move_jar} && ${remove_dir}",
- path => ['/bin', '/usr/bin'],
- cwd => '/tmp',
+ exec { 'jenkins-cli' :
+ command => "${extract_jar} && ${move_jar} && ${remove_dir}",
+ path => ['/bin', '/usr/bin'],
+ cwd => '/tmp',
creates => $jar,
- require => Package['jenkins'],
+ require => Package['jenkins'],
+ }
}
+
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment