Merge pull request #519 from 3flex/refactor-packages

Clean up package classes, allow installing mainline upstream packages
voxpupuli · Dec 15, 2014 · bbbb1ca · bbbb1ca
2 parents 332be4c + fef520f
commit bbbb1ca
Show file tree

Hide file tree

Showing 23 changed files with 148 additions and 469 deletions.
diff --git a/README.markdown b/README.markdown
@@ -18,6 +18,7 @@ This module manages NGINX configuration.
 ### Requirements
 
 * Puppet-2.7.0 or later
+* Facter 1.7.0 or later
 * Ruby-1.9.3 or later (Support for Ruby-1.8.7 is not guaranteed. YMMV).
 
 ### Install and bootstrap an NGINX instance

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -100,9 +100,9 @@
 
   ### START Package Configuration ###
   $package_ensure                 = present,
-  $package_name                   = 'nginx',
+  $package_name                   = $::nginx::params::package_name,
   $package_source                 = 'nginx',
-  $manage_repo                    = true,
+  $manage_repo                    = $::nginx::params::manage_repo,
   ### END Package Configuration ###
 
   ### START Service Configuation ###
@@ -120,7 +120,7 @@
   $nginx_vhosts                   = {},
   $nginx_vhosts_defaults          = {},
   ### END Hiera Lookups ###
-) {
+) inherits ::nginx::params {
 
   ### DEPRECATION WARNING ###
   ###

diff --git a/manifests/package.pp b/manifests/package.pp
@@ -14,11 +14,11 @@
 #
 # This class file is not called directly
 class nginx::package(
-  $package_name   = 'nginx',
+  $package_name   = $::nginx::params::package_name,
   $package_source = 'nginx',
   $package_ensure = 'present',
-  $manage_repo    = true,
-) {
+  $manage_repo    = $::nginx::params::manage_repo,
+) inherits ::nginx::params {
 
   anchor { 'nginx::package::begin': }
   anchor { 'nginx::package::end': }
@@ -27,6 +27,7 @@
     'redhat': {
       class { '::nginx::package::redhat':
         manage_repo    => $manage_repo,
+        package_source => $package_source,
         package_ensure => $package_ensure,
         package_name   => $package_name,
         require        => Anchor['nginx::package::begin'],
@@ -43,67 +44,22 @@
         before         => Anchor['nginx::package::end'],
       }
     }
-    'suse': {
-      class { '::nginx::package::suse':
-        package_name => $package_name,
-        require      => Anchor['nginx::package::begin'],
-        before       => Anchor['nginx::package::end'],
-      }
-    }
-    'archlinux': {
-      class { '::nginx::package::archlinux':
-        require => Anchor['nginx::package::begin'],
-        before  => Anchor['nginx::package::end'],
-      }
-    }
     'Solaris': {
-      class { '::nginx::package::solaris':
-        package_name   => $package_name,
-        package_source => $package_source,
-        package_ensure => $package_ensure,
-        require        => Anchor['nginx::package::begin'],
-        before         => Anchor['nginx::package::end'],
-      }
-    }
-    'FreeBSD': {
-      class { '::nginx::package::freebsd':
-        package_name   => $package_name,
-        package_ensure => $package_ensure,
-        require        => Anchor['nginx::package::begin'],
-        before         => Anchor['nginx::package::end'],
-      }
-    }
-    'Gentoo': {
-      class { '::nginx::package::gentoo':
-        package_name   => $package_name,
-        package_ensure => $package_ensure,
-        require        => Anchor['nginx::package::begin'],
-        before         => Anchor['nginx::package::end'],
+      # $package_name needs to be specified. SFEnginx,CSWnginx depending on
+      # where you get it.
+      if $package_name == undef {
+        fail('You must supply a value for $package_name on Solaris')
       }
-    }
-    'OpenBSD': {
-      class { '::nginx::package::openbsd':
-        package_name   => $package_name,
-        package_ensure => $package_ensure,
-        require        => Anchor['nginx::package::begin'],
-        before         => Anchor['nginx::package::end'],
+
+      package { 'nginx':
+        ensure => $package_ensure,
+        name   => $package_name,
+        source => $package_source,
       }
     }
     default: {
-      case $::operatingsystem {
-        'amazon': {
-          # Amazon was added to osfamily RedHat in 1.7.2
-          # https://github.com/puppetlabs/facter/commit/c12d3b6c557df695a7b2b009da099f6a93c7bd31#lib/facter/osfamily.rb
-          warning("Module ${module_name} support for ${::operatingsystem} with facter < 1.7.2 is deprecated")
-          warning("Please upgrade from facter ${::facterversion} to >= 1.7.2")
-          class { '::nginx::package::redhat':
-            require => Anchor['nginx::package::begin'],
-            before  => Anchor['nginx::package::end'],
-          }
-        }
-        default: {
-          fail("Module ${module_name} is not supported on ${::operatingsystem}")
-        }
+      package { 'nginx':
+        ensure => $package_ensure,
       }
     }
   }

diff --git a/manifests/package/archlinux.pp b/manifests/package/archlinux.pp
diff --git a/manifests/package/debian.pp b/manifests/package/debian.pp
@@ -22,51 +22,53 @@
 
   $distro = downcase($::operatingsystem)
 
-  package { $package_name:
-    ensure  => $package_ensure,
-    require => Anchor['nginx::apt_repo'],
+  package { 'nginx':
+    ensure => $package_ensure,
+    name   => $package_name,
   }
 
-  anchor { 'nginx::apt_repo' : }
-
   if $manage_repo {
     include '::apt'
+    Exec['apt_update'] -> Package['nginx']
 
     case $package_source {
-      'nginx': {
+      'nginx', 'nginx-stable': {
         apt::source { 'nginx':
           location   => "http://nginx.org/packages/${distro}",
           repos      => 'nginx',
           key        => '7BD9BF62',
           key_source => 'http://nginx.org/keys/nginx_signing.key',
-          notify     => Exec['apt_get_update_for_nginx'],
+        }
+      }
+      'nginx-mainline': {
+        apt::source { 'nginx':
+          location   => "http://nginx.org/packages/mainline/${distro}",
+          repos      => 'nginx',
+          key        => '7BD9BF62',
+          key_source => 'http://nginx.org/keys/nginx_signing.key',
         }
       }
       'passenger': {
-        ensure_resource('package', 'apt-transport-https', {'ensure' => 'present' })
-
         apt::source { 'nginx':
-          location   => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
-          repos      => 'main',
-          key        => '561F9B9CAC40B2F7',
-          key_source => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
-          notify     => Exec['apt_get_update_for_nginx'],
+          location          => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
+          repos             => 'main',
+          key               => '561F9B9CAC40B2F7',
+          key_source        => 'https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt',
+          required_packages => 'apt-transport-https ca-certificates',
         }
 
         package { 'passenger':
           ensure  => 'present',
-          require => Anchor['nginx::apt_repo'],
+          require => Exec['apt_update'],
+        }
+
+        if $package_name != 'nginx-extras' {
+          warning('You must set $package_name to "nginx-extras" to enable Passenger')
         }
       }
-      default: {}
-    }
-
-    exec { 'apt_get_update_for_nginx':
-      command     => '/usr/bin/apt-get update',
-      timeout     => 240,
-      returns     => [ 0, 100 ],
-      refreshonly => true,
-      before      => Anchor['nginx::apt_repo'],
+      default: {
+        fail("\$package_source must be 'nginx-stable', 'nginx-mainline' or 'passenger'. It was set to '${package_source}'")
+      }
     }
   }
 }
diff --git a/manifests/package/freebsd.pp b/manifests/package/freebsd.pp
diff --git a/manifests/package/gentoo.pp b/manifests/package/gentoo.pp
diff --git a/manifests/package/openbsd.pp b/manifests/package/openbsd.pp
diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp
@@ -17,62 +17,51 @@
   $manage_repo    = true,
   $package_ensure = 'present',
   $package_name   = 'nginx',
+  $package_source = 'nginx-stable',
 ) {
 
-  if $::lsbmajdistrelease {
-    $major_dist_release = $::lsbmajdistrelease
+  #Install the CentOS-specific packages on that OS, otherwise assume it's a RHEL
+  #clone and provide the Red Hat-specific package. This comes into play when not
+  #on RHEL or CentOS and $manage_repo is set manually to 'true'.
+  if $::operatingsystem == 'centos' {
+    $_os = 'centos'
+  } else {
+    $_os = 'rhel'
   }
-  else {
-    $major_dist_release = $::operatingsystemmajrelease
-  }
-
-  case $::operatingsystem {
-    'fedora': {
-      # nginx.org does not supply RPMs for fedora
-      # fedora 18 provides 1.2.x packages
-      # fedora 19 has 1.4.x packages are in
 
-      # fedora 18 users will need to supply their own nginx 1.4 rpms and/or repo
-      if $::lsbmajdistrelease and $::lsbmajdistrelease < 19 {
-        notice("${::operatingsystem} ${::lsbmajdistrelease} does not supply nginx >= 1.4 packages")
-      }
-    }
-    default: {
-      case $major_dist_release {
-        5, 6, 7: {
-          $os_rel = $major_dist_release
-        }
-        default: {
-          # Amazon uses the year as the $::lsbmajdistrelease
-          $os_rel = 6
+  if $manage_repo {
+    case $package_source {
+      'nginx', 'nginx-stable': {
+        yumrepo { 'nginx-release':
+          baseurl  => "http://nginx.org/packages/${_os}/${::operatingsystemmajrelease}/\$basearch/",
+          descr    => 'nginx repo',
+          enabled  => '1',
+          gpgcheck => '1',
+          priority => '1',
+          gpgkey   => 'http://nginx.org/keys/nginx_signing.key',
+          before   => Package[$package_name],
         }
       }
-
-      # as of 2013-07-28
-      # http://nginx.org/packages/centos appears to be identical to
-      # http://nginx.org/packages/rhel
-      # no other dedicated dirs exist for platforms under $::osfamily == redhat
-      if $manage_repo {
+      'nginx-mainline': {
         yumrepo { 'nginx-release':
-          baseurl  => "http://nginx.org/packages/rhel/${os_rel}/\$basearch/",
+          baseurl  => "http://nginx.org/packages/mainline/${_os}/${::operatingsystemmajrelease}/\$basearch/",
           descr    => 'nginx repo',
           enabled  => '1',
           gpgcheck => '1',
           priority => '1',
           gpgkey   => 'http://nginx.org/keys/nginx_signing.key',
           before   => Package[$package_name],
         }
-
-        file { '/etc/yum.repos.d/nginx-release.repo':
-          ensure  => present,
-          require => Yumrepo['nginx-release'],
-        }
+      }
+      default: {
+        fail("\$package_source must be 'nginx-stable' or 'nginx-mainline'. It was set to '${package_source}'")
       }
     }
   }
 
-  package { $package_name:
-    ensure  => $package_ensure,
+  package { 'nginx':
+    ensure => $package_ensure,
+    name   => $package_name,
   }
 
 }
diff --git a/manifests/package/solaris.pp b/manifests/package/solaris.pp