summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-02-07 12:34:51 +0100
committervarac <varacanero@zeromail.org>2013-02-07 12:34:51 +0100
commit93a514a61ccfd656796d5b5cd143ea4cfacbc15b (patch)
tree37bb3f26e23060858336a5f5e38b5aac2fefc280 /puppet/modules/site_config
parent07cc737f655c9fc0afe50e9850963120114ee18e (diff)
parent173b2dc3ecbdab2cacede4e50f6fa3f5daa3c683 (diff)
Merge branch 'feature/tor' into develop
Diffstat (limited to 'puppet/modules/site_config')
-rw-r--r--puppet/modules/site_config/manifests/default.pp3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index c65c0799..2191e9a1 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -30,4 +30,7 @@ class site_config::default {
package { [ 'etckeeper' ]:
ensure => installed,
}
+
+ # include basic shorewall config
+ include site_shorewall::defaults
}