diff options
Diffstat (limited to 'manifests/series5')
| -rw-r--r-- | manifests/series5/packages/default.pp | 6 | ||||
| -rw-r--r-- | manifests/series5/packages/dpa.pp | 7 | ||||
| -rw-r--r-- | manifests/series5/packages/ppa.pp | 7 | 
3 files changed, 12 insertions, 8 deletions
| diff --git a/manifests/series5/packages/default.pp b/manifests/series5/packages/default.pp index f16e03e..7dd51af 100644 --- a/manifests/series5/packages/default.pp +++ b/manifests/series5/packages/default.pp @@ -13,10 +13,4 @@ class php::series5::packages::default {    package { 'php5-suhosin':      ensure => absent,    } - -  # The needed apache modules -  apache::module { 'php5': -    ensure  => present, -    require => Package['libapache2-mod-php5'], -  }  } diff --git a/manifests/series5/packages/dpa.pp b/manifests/series5/packages/dpa.pp index f9fad94..bff8bd1 100644 --- a/manifests/series5/packages/dpa.pp +++ b/manifests/series5/packages/dpa.pp @@ -51,10 +51,15 @@ class php::series5::packages::dpa {      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'], +    require => [ Package['libapache2-mod-php5.6'], Apache::Module['php5'] ],    }    # Default alternative diff --git a/manifests/series5/packages/ppa.pp b/manifests/series5/packages/ppa.pp index f821ab4..10c5b56 100644 --- a/manifests/series5/packages/ppa.pp +++ b/manifests/series5/packages/ppa.pp @@ -39,10 +39,15 @@ class php::series5::packages::ppa {      #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'], +    require => [ Package['libapache2-mod-php5.6'], Apache::Module['php5'] ],    }    # Default alternative | 
