diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-03 18:15:33 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-03 18:15:33 -0200 |
| commit | 4d4f55998d43a2cf177d0d5e200a1757a4839034 (patch) | |
| tree | 2591fa504c2335650a5ab40c69affe0c75e10956 | |
| parent | f91da8d7c1cd2fef535ac48d6d34524f90e870c7 (diff) | |
| download | puppet-php-4d4f55998d43a2cf177d0d5e200a1757a4839034.tar.gz puppet-php-4d4f55998d43a2cf177d0d5e200a1757a4839034.tar.bz2 | |
Cleanup and organization
| -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, - } -} |