diff options
| -rw-r--r-- | manifests/imap.pp | 5 | ||||
| -rw-r--r-- | manifests/init.pp | 13 |
2 files changed, 5 insertions, 13 deletions
diff --git a/manifests/imap.pp b/manifests/imap.pp new file mode 100644 index 0000000..381add6 --- /dev/null +++ b/manifests/imap.pp @@ -0,0 +1,5 @@ +class php::imap inherits php { + package { 'php5-imap': + ensure => installed, + } +} diff --git a/manifests/init.pp b/manifests/init.pp index b28f3bf..2901bf9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,13 +27,6 @@ class php { ensure => absent, } - # Useful when upgrading from squeeze - if $::lsbdistcodename == 'wheezy' { - file { [ '/etc/php5/apache2/conf.d/suhosin.ini', '/etc/php5/conf.d/suhosin.ini' ]: - ensure => absent, - } - } - # The needed apache modules apache::module { 'php5': ensure => present, @@ -67,9 +60,3 @@ class php { require => Package['php5'], } } - -class php::imap inherits php { - package { 'php5-imap': - ensure => installed, - } -} |