From 236336c6755c569ff43589b1256f177f11cfb1a0 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 14 Feb 2011 13:32:38 -0200
Subject: Make $shorewall_ensure_version = present by default

---
 manifests/base.pp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 58b753e..53600e7 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,4 +1,8 @@
 class shorewall::base {
+    case $shorewall_ensure_version {
+      '': { $shorewall_ensure_version = 'present' }
+    }
+
     package { 'shorewall':
         ensure => $shorewall_ensure_version,
     }
-- 
cgit v1.2.3


From fc200fa2135f7bbc86564f17f476df6257affcf0 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 13 Sep 2011 22:16:00 -0300
Subject: Adding shorewall::tunnel

---
 manifests/base.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 53600e7..be3b1f6 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -46,6 +46,7 @@ class shorewall::base {
             File["/var/lib/puppet/modules/shorewall/tcdevices"],
             File["/var/lib/puppet/modules/shorewall/tcrules"],
             File["/var/lib/puppet/modules/shorewall/tcclasses"],
+            File["/var/lib/puppet/modules/shorewall/tunnel"],
         ],
         require => Package[shorewall],
     }
-- 
cgit v1.2.3


From eac5a3c28c4773531964f77e25291c88efcc5e12 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 2 Jan 2013 19:46:52 +0100
Subject: provide an easy option to still manage the source of the central conf
 file

---
 manifests/base.pp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 52e77d8..4324553 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -16,6 +16,12 @@ class shorewall::base {
         owner => root, group => 0, mode => 0644;
     }
 
+    if $shorewall::conf_source {
+      File['/etc/shorewall/shorewall.conf']{
+        source => $shorewall::conf_source,
+      }
+    }
+
     augeas { 'shorewall_module_config_path':
       changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'',
       lens    => 'Shellvars.lns',
-- 
cgit v1.2.3


From 9e79c7c55755e4cff5097d34c14396fdb0f15f85 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 24 Jan 2013 16:03:26 -0500
Subject: fix missing dependency on augeas

make sure that the augeas class has been applied before attempting to do any
augeas operations. without this, you will non-deterministically get:

    err: /Stage[main]/Shorewall::Base/Augeas[shorewall_module_config_path]: Could not evaluate: Save failed with return code false
---
 manifests/base.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 4324553..f2004ab 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -22,11 +22,14 @@ class shorewall::base {
       }
     }
 
+    include augeas
+
     augeas { 'shorewall_module_config_path':
       changes => 'set /files/etc/shorewall/shorewall.conf/CONFIG_PATH \'"/etc/shorewall/puppet:/etc/shorewall:/usr/share/shorewall"\'',
       lens    => 'Shellvars.lns',
       incl    => '/etc/shorewall/shorewall.conf',
-      notify  => Service[shorewall];
+      notify  => Service[shorewall],
+      require => Class[augeas];
     }
 
     service{shorewall:
-- 
cgit v1.2.3