From 19a3a2cda8682e8b00f8c8962461cd8b4fef10d5 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 12 Apr 2018 12:29:24 -0300 Subject: Refactor and add php-fpm support --- manifests/series5/packages.pp | 48 ++++++++++++++++++++ manifests/series5/packages/default.pp | 16 ------- manifests/series5/packages/dpa.pp | 72 ------------------------------ manifests/series5/packages/ppa.pp | 84 ----------------------------------- 4 files changed, 48 insertions(+), 172 deletions(-) create mode 100644 manifests/series5/packages.pp delete mode 100644 manifests/series5/packages/default.pp delete mode 100644 manifests/series5/packages/dpa.pp delete mode 100644 manifests/series5/packages/ppa.pp (limited to 'manifests/series5') diff --git a/manifests/series5/packages.pp b/manifests/series5/packages.pp new file mode 100644 index 0000000..2d7e196 --- /dev/null +++ b/manifests/series5/packages.pp @@ -0,0 +1,48 @@ +class php::series5::packages { + # 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 old module + apache::module { 'php5': + ensure => absent, + } + + # The needed apache modules + apache::module { 'php5.6': + ensure => present, + require => [ Package['libapache2-mod-php5.6'], Apache::Module['php5'] ], + } + + # Default alternative + file { "/etc/alternatives/php": + ensure => "/usr/bin/php5.6", + owner => root, + group => root, + require => Package['php5'], + } +} diff --git a/manifests/series5/packages/default.pp b/manifests/series5/packages/default.pp deleted file mode 100644 index 7dd51af..0000000 --- a/manifests/series5/packages/default.pp +++ /dev/null @@ -1,16 +0,0 @@ -class php::series5::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, - } -} diff --git a/manifests/series5/packages/dpa.pp b/manifests/series5/packages/dpa.pp deleted file mode 100644 index 297c4a2..0000000 --- a/manifests/series5/packages/dpa.pp +++ /dev/null @@ -1,72 +0,0 @@ -class php::series5::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 old module - apache::module { 'php5': - ensure => absent, - } - - # The needed apache modules - apache::module { 'php5.6': - ensure => present, - require => [ Package['libapache2-mod-php5.6'], Apache::Module['php5'] ], - } - - # Default alternative - file { "/etc/alternatives/php": - ensure => "/usr/bin/php5.6", - owner => root, - group => root, - require => Package['php5'], - } -} diff --git a/manifests/series5/packages/ppa.pp b/manifests/series5/packages/ppa.pp deleted file mode 100644 index e420822..0000000 --- a/manifests/series5/packages/ppa.pp +++ /dev/null @@ -1,84 +0,0 @@ -class php::series5::packages::ppa { - #package { 'python-software-properties': - # ensure => present, - #} - - # This required alternative checking of 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'], - #} - - file { '/etc/apt/trusted.gpg.d/ondrej_ubuntu_php.gpg': - ensure => present, - owner => "root", - group => "root", - mode => "0644", - source => 'puppet:///modules/php/ondrej_ubuntu_php.gpg', - } - - file { '/etc/apt/sources.list.d/php.list': - ensure => present, - owner => "root", - group => "root", - mode => "0644", - content => "deb http://ppa.launchpad.net/ondrej/php/ubuntu ${::lsbdistcodename} main\n", - require => File['/etc/apt/trusted.gpg.d/ondrej_ubuntu_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 => 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 old module - apache::module { 'php5': - ensure => absent, - } - - # The needed apache modules - apache::module { 'php5.6': - ensure => present, - require => [ Package['libapache2-mod-php5.6'], Apache::Module['php5'] ], - } - - # Default alternative - file { "/etc/alternatives/php": - ensure => "/usr/bin/php5.6", - owner => root, - group => root, - require => Package['php5'], - } -} -- cgit v1.2.3