From 5f3ed06fc85c3c9cb8d80c03d157bcc29bf75798 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 2 Nov 2017 13:01:00 -0200
Subject: Support both PHP 5 and 7, defaults to 5

---
 manifests/packages/default.pp | 22 --------------
 manifests/packages/dpa.pp     | 67 -------------------------------------------
 manifests/packages/ppa.pp     | 55 -----------------------------------
 3 files changed, 144 deletions(-)
 delete mode 100644 manifests/packages/default.pp
 delete mode 100644 manifests/packages/dpa.pp
 delete mode 100644 manifests/packages/ppa.pp

(limited to 'manifests/packages')

diff --git a/manifests/packages/default.pp b/manifests/packages/default.pp
deleted file mode 100644
index e1f2bf1..0000000
--- a/manifests/packages/default.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-class php::packages::default {
-  # The needed packages: we could also try libapache2-mod-php5filter
-  package { [ 'php5', 'php5-mysql', 'php5-sqlite', 'php5-cli', 'php5-curl', 'php5-gmp', 'libapache2-mod-php5' ]:
-    ensure => installed,
-  }
-
-  # Optional packages
-  package { [ "php5-gd", "php5-imagick" ]:
-    ensure => installed,
-  }
-
-  # Not available anymore
-  package { 'php5-suhosin':
-    ensure => absent,
-  }
-
-  # The needed apache modules
-  apache::module { 'php5':
-    ensure  => present,
-    require => Package['libapache2-mod-php5'],
-  }
-}
diff --git a/manifests/packages/dpa.pp b/manifests/packages/dpa.pp
deleted file mode 100644
index b09b061..0000000
--- a/manifests/packages/dpa.pp
+++ /dev/null
@@ -1,67 +0,0 @@
-class php::packages::dpa {
-  file { '/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg':
-    ensure  => present,
-    owner   => "root",
-    group   => "root",
-    mode    => "0644",
-    source  => 'puppet:///modules/php/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/deb.sury.org-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", "php5.6-xml", "php5.6-mbstring" ]:
-    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/ppa.pp b/manifests/packages/ppa.pp
deleted file mode 100644
index e38cccb..0000000
--- a/manifests/packages/ppa.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-class php::packages::ppa {
-  #package { 'python-software-properties':
-  #  ensure => present,
-  #}
-
-  ## TODO: check repository key!
-  #exec { 'add-apt-repository-ondrej-php':
-  #  command => '/usr/bin/add-apt-repository -y ppa:ondrej/php && apt-get update',
-  #  user    => 'root',
-  #  creates => '/etc/apt/sources.list.d/ondrej-ubuntu-php-xenial.list',
-  #  require => Package['python-software-properties'],
-  #}
-
-  # The needed packages: we could also try libapache2-mod-php5.6filter
-  package { 'php5':
-    name    => 'php5.6',
-    #require => Exec['add-apt-repository-ondrej-php'],
-  }
-
-  package { 'php5-cli':
-    name    => 'php5.6-cli',
-    #require => Exec['add-apt-repository-ondrej-php'],
-  }
-
-  package { [ 'php5.6-mysql', 'php5.6-sqlite3', 'php5.6-curl', 'php5.6-gmp', 'libapache2-mod-php5.6' ]:
-    ensure  => installed,
-    #require => Exec['add-apt-repository-ondrej-php'],
-  }
-
-  # Optional packages
-  package { [ "php5.6-gd", "php-imagick", "php5.6-xml", "php5.6-mbstring" ]:
-    ensure  => installed,
-    #require => Exec['add-apt-repository-ondrej-php'],
-  }
-
-  # Not available anymore
-  package { 'php5.6-suhosin':
-    ensure  => absent,
-    #require => Exec['add-apt-repository-ondrej-php'],
-  }
-
-  # 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'],
-  }
-}
-- 
cgit v1.2.3