Issue 4733 - Extend class nginx to be compatible with Debian releases

Vagrantfile

@@ -59,7 +59,7 @@ Vagrant.configure('2') do |config|
           set -e -- '#{sync_path}' /etc/puppet/hiera.yaml
           if ! which puppet >/dev/null; then
             apt-get -y update
-            apt-get -y install puppet
+            apt-get -y install puppet apt-transport-https
           fi
           test -e "$1" || ln -s /vagrant "$1"
           test -e "$2" || ln -s infrastructure/hiera/hiera.yaml "$2"

modules/nginx/manifests/init.pp

@@ -10,25 +10,44 @@
   # the inclusion here became necessary.
   include ssh
 
-  apt::ppa {'ppa:nginx/stable':
+  package {'nginx':
+    ensure => 'latest',
   }
 
-  apt::source {'nginx':
-    ensure => 'absent',
-  }
+  if $::lsbdistcodename == 'precise' {
+
+    apt::ppa {'ppa:nginx/stable':
+    }
+
+    apt::source {'nginx':
+      ensure => 'absent',
+    }
 
-  exec {'purge-nginx':
-    command => '/usr/bin/apt-get -y purge nginx',
-    logoutput => true,
-    path => '/usr/sbin:/usr/bin:/sbin:/bin',
-    refreshonly => true,
-    returns => [0, 100],
-    subscribe => Apt::Ppa['ppa:nginx/stable'],
+    exec {'purge-nginx':
+      before => Package['nginx'],
+      command => '/usr/bin/apt-get -y purge nginx',
+      logoutput => true,
+      path => '/usr/sbin:/usr/bin:/sbin:/bin',
+      refreshonly => true,
+      returns => [0, 100],
+      subscribe => Apt::Ppa['ppa:nginx/stable'],
+    }
   }
 
-  package {'nginx':
-    ensure => '1.10.1-3+precise3',
-    require => Exec['purge-nginx'],
+  if $::operatingsystem == 'Debian' {
+
+    apt::key {'nginx':
+      key => 'ABF5BD827BD9BF62',
+      key_content => template('nginx/apt.key.erb'),
+    }
+
+    apt::source {'nginx':
+      before => Package['nginx'],
+      location => 'https://nginx.org/packages/mainline/debian/',
+      release => downcase($::lsbdistcodename),
+      repos => 'nginx',
+      require => Apt::Key['nginx'],
+    }
   }
 
   user {'nginx':

modules/nginx/templates/apt.key.erb

@@ -0,0 +1,106 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+=PSRY
+-----END PGP PUBLIC KEY BLOCK-----