From 7b062baee2e55c34f6c71a8f10919492de0bb2c5 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 7 Sep 2014 16:27:20 +0100 Subject: [PATCH] add memcache to open ports Signed-off-by: Stephen Gran --- modules/ferm/manifests/per-host.pp | 4 ++++ tools/git-hooks/pre-commit | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 6d73b4a0..3ab0d631 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -19,6 +19,10 @@ class ferm::per-host { } } oyens: { + @ferm::rule { 'dsa-memcache': + description => 'Allow memcache access', + rule => '&SERVICE_RANGE(tcp, 11211, ( 5.153.231.240/27 172.29.123.0/24 ))' + } @ferm::rule { 'dsa-amqp': description => 'Allow rabbitmq access', rule => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 ))' diff --git a/tools/git-hooks/pre-commit b/tools/git-hooks/pre-commit index 8364fdce..44060897 100755 --- a/tools/git-hooks/pre-commit +++ b/tools/git-hooks/pre-commit @@ -21,7 +21,7 @@ check_puppet_manifest () { git cat-file blob :0:${file} | sed 's/^import .*/#&/' >${pp} trap "rm -f ${pp}" RETURN - local output=$(puppet parser validate --storeconfigs true ${pp} 2>&1) + local output=$(puppet parser validate ${pp} 2>&1) if [ $? -ne 0 ] || [ -n "${output}" ]; then echo '** Syntax check failed:' >&2 echo "${output}" >&2 -- 2.39.2