From e35a66651a263046ef2e0a0a4b5231a4a4d99d12 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 29 Dec 2017 23:28:29 -0200
Subject: Misc fixes

---
 manifests/composer.pp                 | 2 +-
 manifests/imap.pp                     | 2 +-
 manifests/series5/packages/default.pp | 6 ------
 manifests/series5/packages/dpa.pp     | 7 ++++++-
 manifests/series5/packages/ppa.pp     | 7 ++++++-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/manifests/composer.pp b/manifests/composer.pp
index b6274f6..3f51ecd 100644
--- 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 805951d..91d6e03 100644
--- 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 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
-- 
cgit v1.2.3