Misc fixes

diff --git a/manifests/composer.pp b/manifests/composer.pp
index b6274f6ec2021681759e7af28f3e50f6c65f0bca..3f51ecd8ecf815f5cd314868f102491c62c170de 100644 (file)
--- a/manifests/composer.pp
+++ b/manifests/composer.pp
@@ -23,7 +23,7 @@ class php::composer(
   }
 
   cron { "composer-self-update":
-    command  => "/usr/local/bin/composer self-update",
+    command  => "/usr/local/bin/composer self-update > /dev/null 2>&1",
     user     => root,
     hour     => "03",
     minute   => "30",

diff --git a/manifests/imap.pp b/manifests/imap.pp
index 805951ddc22d72c08ef4ce5215318b37f3142281..91d6e036a2df7022ce45d19a9b805d85ac465525 100644 (file)
--- a/manifests/imap.pp
+++ b/manifests/imap.pp
@@ -4,7 +4,7 @@ class php::imap {
      default => 'php-imap',
   }
 
-  package { "${pack"}:
+  package { "${pack}":
     ensure => installed,
   }
 }

diff --git a/manifests/series5/packages/default.pp b/manifests/series5/packages/default.pp
index f16e03ef879b0cf4865915f9f1df35c4c688bb69..7dd51af4c603f67c92e3a59fd1efe32cd4a475f4 100644 (file)
--- 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 f9fad94faa0e3286a80f108318942568d592ec7f..bff8bd11bd89d3ae2eb2f8b9d925c33274a7478c 100644 (file)
--- 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 f821ab4df30b4dce791ace9d764678697c2567ec..10c5b56920606e7edcad5e719815cab710f2e89e 100644 (file)
--- 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