initial support for direct download package installation

manifests/config.pp

@@ -16,9 +16,6 @@
     fail("Use of private class ${name} by ${caller_module_name}")
   }
 
-  include jenkins::package
-
-  Class['Jenkins::Package']->Class['Jenkins::Config']
   create_resources( 'jenkins::sysconfig', $::jenkins::config_hash )
 }
 

manifests/direct_download.pp

@@ -0,0 +1,38 @@
+# 
+# Support for directly downloading a package file - for when no repository
+# is available
+#
+class jenkins::direct_download {  
+  if $caller_module_name != $module_name {
+    fail("Use of private class ${name} by ${caller_module_name}")
+  }
+
+  validate_string($::jenkins::package_provider)
+  validate_string($::jenkins::direct_download)
+  validate_absolute_path($::jenkins::package_cache_dir)
+  if $::jenkins::version {
+    validate_string($::jenkins::version)  
+  }
+
+  # stdlib 4.6 has 'basename'
+  #$package_file = basename($::jenkins::download_url)
+  $package_file = regsubst($::jenkins::direct_download, '(.*?)([^/]+)$', '\2')
+  $local_file = "${::jenkins::package_cache_dir}/${package_file}"
+
+  validate_absolute_path($local_file)
+
+  if $::jenkins::version {
+    # make download optional if we are removing...
+    staging::file { $package_file:
+      source  => $jenkins::direct_download,
+      target  => $local_file,
+      before  => Package[$::jenkins::package_name],
+    }
+  } 
+
+  package { $::jenkins::package_name:
+    ensure   => $::jenkins::version,
+    provider => $::jenkins::package_provider,
+    source   => $local_file,
+  } 
+}

manifests/init.pp

@@ -23,6 +23,18 @@
 #   this module.
 #   This is for folks that use a custom repo, or the like.
 #
+# package_name = 'jenkins'
+#   Optionally override the package name
+#
+# direct_download = 'http://...'
+#   Ignore repostory based package installation and download and install 
+#   package directly.  Leave as `false` (the default) to download using your
+#   OS package manager
+#
+# package_cache_dir  = '/var/cache/jenkins_pkgs'
+#   Optionally specify an alternate location to download packages to when using
+#   direct_download
+#
 # service_enable = true (default)
 #   Enable (or not) the jenkins service
 #
@@ -109,6 +121,10 @@
   $version            = $jenkins::params::version,
   $lts                = $jenkins::params::lts,
   $repo               = $jenkins::params::repo,
+  $package_name       = $jenkins::params::package_name,
+  $direct_download    = false,
+  $package_cache_dir  = $jenkins::params::package_cache_dir,
+  $package_provider   = $jenkins::params::package_provider,
   $service_enable     = $jenkins::params::service_enable,
   $service_ensure     = $jenkins::params::service_ensure,
   $config_hash        = {},
@@ -146,11 +162,24 @@
     }
   }
 
-  if $repo {
+  if ! $direct_download and $repo {
     include jenkins::repo
+    $repo_ = true
+  } elsif direct_download {
+    $repo_ = false
+    file { $package_cache_dir:
+      ensure => directory,
+      owner  => "root",
+      group  => "root",
+      mode   => "0644",
+    }
+    include jenkins::direct_download
+    $jenkins_package_class = 'jenkins::direct_download'
+  } else {
+    include jenkins::package
+    $jenkins_package_class = 'jenkins::package'
   }
 
-  include jenkins::package
   include jenkins::config
   include jenkins::plugins
   include jenkins::jobs
@@ -177,7 +206,7 @@
   }
 
   Anchor['jenkins::begin'] ->
-    Class['jenkins::package'] ->
+    Class[$jenkins_package_class] ->
       Class['jenkins::config'] ->
         Class['jenkins::plugins'] ~>
           Class['jenkins::service'] ->
@@ -195,11 +224,11 @@
   if $install_java {
     Anchor['jenkins::begin'] ->
       Class['java'] ->
-        Class['jenkins::package'] ->
+        Class[$jenkins_package_class] ->
           Anchor['jenkins::end']
   }
 
-  if $repo {
+  if $repo_ {
     Anchor['jenkins::begin'] ->
       Class['jenkins::repo'] ->
         Class['jenkins::package'] ->

manifests/package.pp

@@ -10,7 +10,7 @@
     fail("Use of private class ${name} by ${caller_module_name}")
   }
 
-  package { 'jenkins' :
-    ensure => $::jenkins::version;
+  package { $::jenkins::package_name:
+    ensure => $::jenkins::version,
   }
 }

manifests/params.pp

@@ -13,10 +13,17 @@
   $port                  = '8080'
   $cli_tries             = 10
   $cli_try_sleep         = 10
+  $package_cache_dir     = '/var/cache/jenkins_pkgs'
+  $package_name          = 'jenkins'
 
   case $::osfamily {
     'Debian': {
-      $libdir = '/usr/share/jenkins'
+      $libdir           = '/usr/share/jenkins'
+      $package_provider = 'dpkg' 
+    }
+    'RedHat': {
+      $libdir           = '/usr/lib/jenkins'
+      $package_provider = 'rpm'
     }
     default: {
       $libdir = '/usr/lib/jenkins'