From acff4b9a8a11f4eb37a00bb8b22a708abf5127bc Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 11 May 2015 21:19:38 +0200
Subject: linted manifests/debian/module.pp

---
 manifests/debian/module.pp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'manifests')

diff --git a/manifests/debian/module.pp b/manifests/debian/module.pp
index 4c100fa..9688430 100644
--- a/manifests/debian/module.pp
+++ b/manifests/debian/module.pp
@@ -1,3 +1,4 @@
+# install/remove apache module on debian/ubuntu systems
 define apache::debian::module(
     $ensure = present,
     $package_name = 'absent'
@@ -6,8 +7,8 @@ define apache::debian::module(
 
     if ($package_name != 'absent') {
         package { $package_name:
-            ensure => $ensure,
-            notify => Service['apache'],
+            ensure  => $ensure,
+            notify  => Service['apache'],
             require => Package['apache'],
         }
     }
@@ -15,20 +16,20 @@ define apache::debian::module(
     case $ensure {
         'absent','purged': {
             exec { "/usr/sbin/a2dismod ${name}":
-                onlyif => "/bin/sh -c '[ -L ${modules_dir}-enabled/${name}.load ] \\
+                onlyif  => "/bin/sh -c '[ -L ${modules_dir}-enabled/${name}.load ] \\
                     && [ ${modules_dir}-enabled/${name}.load -ef ${modules_dir}-available/${name}.load ]'",
-                notify => Service['apache'],
+                notify  => Service['apache'],
                 require => Package['apache'],
             }
         }
         default : {
             exec { "/usr/sbin/a2enmod ${name}":
-                unless => "/bin/sh -c '[ -L ${modules_dir}-enabled/${name}.load ] \\
+                unless  => "/bin/sh -c '[ -L ${modules_dir}-enabled/${name}.load ] \\
                     && [ ${modules_dir}-enabled/${name}.load -ef ${modules_dir}-available/${name}.load ]'",
-                notify => Service['apache'],
+                notify  => Service['apache'],
                 require => $package_name ? {
                     'absent' => Package['apache'],
-                    default => Package[['apache',$package_name]],
+                    default  => Package[['apache',$package_name]],
                 },
             }
         }
-- 
cgit v1.2.3


From b4a7f74268b71c3c63f460b3c86287aa0806c237 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 11 May 2015 21:25:06 +0200
Subject: Fix ordering between purging and adding/removing modules for debian

Before, purging files from the `mods-enabled` dir and adding
modules to this dir happened unordered, meaning that some modules are
added before all old modules are purged. Puppet (3.7.2) somehow screws
this up and some modules are not installed that should be.

see https://gitlab.com/shared-puppet-modules-group/apache/issues/6
for details
---
 manifests/debian/module.pp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'manifests')

diff --git a/manifests/debian/module.pp b/manifests/debian/module.pp
index 9688430..252948f 100644
--- a/manifests/debian/module.pp
+++ b/manifests/debian/module.pp
@@ -9,7 +9,7 @@ define apache::debian::module(
         package { $package_name:
             ensure  => $ensure,
             notify  => Service['apache'],
-            require => Package['apache'],
+            require => [ File['modules_dir'], Package['apache'] ],
         }
     }
 
@@ -27,10 +27,13 @@ define apache::debian::module(
                 unless  => "/bin/sh -c '[ -L ${modules_dir}-enabled/${name}.load ] \\
                     && [ ${modules_dir}-enabled/${name}.load -ef ${modules_dir}-available/${name}.load ]'",
                 notify  => Service['apache'],
-                require => $package_name ? {
+                require => [
+                  File['modules_dir'],
+                  $package_name ? {
                     'absent' => Package['apache'],
                     default  => Package[['apache',$package_name]],
-                },
+                  }
+                ],
             }
         }
     }
-- 
cgit v1.2.3