From 2b75a0321bc9e65f4e9e6cf34b708a3d40318731 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Tue, 31 Jan 2017 12:16:33 -0800
Subject: don't include augeas due to conflict with riseup_common

---
 manifests/base.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/base.pp b/manifests/base.pp
index 6599759..9d65b7b 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -27,7 +27,8 @@ class shorewall::base {
     }
   } else {
 
-    include ::augeas
+    # riseup commented due to redeclare
+    #include ::augeas
     Class['augeas'] -> Class['shorewall::base']
 
     augeas { 'shorewall_module_config_path':
-- 
cgit v1.2.3