Cleanup and organization

diff --git a/manifests/imap.pp b/manifests/imap.pp
new file mode 100644 (file)
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 b28f3bfeca24a901714842ee721031bd0f35ff0f..2901bf91ed1e01a4513d176f083e060d55452377 100644 (file)
--- 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,
-  }
-}