From 7952643b01ce91646c0fcc64341ddabd15038dbe Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 11 Jul 2017 11:48:28 -0300
Subject: [PATCH] Uses apt::packages::dpa and apt::packages::ppa

---
 files/deb.sury.org.gpg                   | Bin 0 -> 2239 bytes
 manifests/init.pp                        |  12 ++--
 manifests/packages/dpa.pp                |  67 +++++++++++++++++++++++
 manifests/packages/{xenial.pp => ppa.pp} |   2 +-
 4 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 files/deb.sury.org.gpg
 create mode 100644 manifests/packages/dpa.pp
 rename manifests/packages/{xenial.pp => ppa.pp} (97%)

diff --git a/files/deb.sury.org.gpg b/files/deb.sury.org.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..dc4d282080e372f91fa6b93ffb9bd6120498d8aa
GIT binary patch
literal 2239
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
N9*~0`;ZKe6G^|RJG!y^;

literal 0
HcmV?d00001

diff --git a/manifests/init.pp b/manifests/init.pp
index c654076..52ac0d4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -18,8 +18,11 @@
 
 class php($hardened = true) {
   case $::lsbdistcodename {
-    'xenial': {
-      include php::packages::xenial
+    'xenial','stretch': {
+      include php::packages::ppa
+    }
+    'stretch': {
+      include php::packages::dpa
     }
     default: {
       include php::packages::default
@@ -27,8 +30,9 @@ class php($hardened = true) {
   }
 
   $folder = $::lsbdistcodename ? {
-    'xenial' => '/etc/php/5.6',
-    default  => '/etc/php5',
+    'xenial'  => '/etc/php/5.6',
+    'stretch' => '/etc/php/5.6',
+    default   => '/etc/php5',
   }
 
   file { [ "${folder}", "${folder}/cli", "${folder}/apache2", "${folder}/cli/conf.d", "${folder}/apache2/conf.d" ]:
diff --git a/manifests/packages/dpa.pp b/manifests/packages/dpa.pp
new file mode 100644
index 0000000..1af6ab9
--- /dev/null
+++ b/manifests/packages/dpa.pp
@@ -0,0 +1,67 @@
+class php::packages::dpa {
+  file { '/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg':
+    ensure  => present,
+    owner   => "root",
+    group   => "root",
+    mode    => "0644",
+    source  => 'pupet:///modules/php/files/deb.sury.org.gpg',
+  }
+
+  file { '/etc/apt/sources.list.d/php.list' :
+    ensure  => present,
+    owner   => "root",
+    group   => "root",
+    mode    => "0644",
+    content => "deb https://packages.sury.org/php/ ${::lsbdistcodename} main\n",
+    require => File['/etc/apt/trusted.gpg.d/php.gpg'],
+    notify  => Exec['php-apt-auto-update'],
+  }
+
+  exec { 'php-apt-auto-update':
+    command     => "/usr/bin/apt-get update",
+    user        => "root",
+    refreshonly => true,
+  }
+
+  # The needed packages: we could also try libapache2-mod-php5.6filter
+  package { 'php5':
+    name    => 'php5.6',
+    require => File['/etc/apt/sources.list.d/php.list',
+  }
+
+  package { 'php5-cli':
+    name    => 'php5.6-cli',
+    require => File['/etc/apt/sources.list.d/php.list',
+  }
+
+  package { [ 'php5.6-mysql', 'php5.6-sqlite3', 'php5.6-curl', 'php5.6-gmp', 'libapache2-mod-php5.6' ]:
+    ensure  => installed,
+    require => File['/etc/apt/sources.list.d/php.list',
+  }
+
+  # Optional packages
+  package { [ "php5.6-gd", "php-imagick" ]:
+    ensure  => installed,
+    require => File['/etc/apt/sources.list.d/php.list',
+  }
+
+  # Not available anymore
+  package { 'php5.6-suhosin':
+    ensure  => absent,
+    require => File['/etc/apt/sources.list.d/php.list',
+  }
+
+  # The needed apache modules
+  apache::module { 'php5.6':
+    ensure  => present,
+    require => Package['libapache2-mod-php5.6'],
+  }
+
+  # Default alternative
+  file { "/etc/alternatives/php":
+    ensure  => "/usr/bin/php5.6",
+    owner   => root,
+    group   => root,
+    require => Package['php5'],
+  }
+}
diff --git a/manifests/packages/xenial.pp b/manifests/packages/ppa.pp
similarity index 97%
rename from manifests/packages/xenial.pp
rename to manifests/packages/ppa.pp
index ef5cb63..4dc4f7a 100644
--- a/manifests/packages/xenial.pp
+++ b/manifests/packages/ppa.pp
@@ -1,4 +1,4 @@
-class php::packages::xenial {
+class php::packages::ppa {
   #package { 'python-software-properties':
   #  ensure => present,
   #}
-- 
2.39.5