From c1bd9b76162f5ec5ce89b10594b9b6c1e353b8f0 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 3 Jan 2015 21:23:07 +0100 Subject: [PATCH] unify naming --- manifests/init.pp | 4 ++-- manifests/switch.pp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index b6ba29b..0f4ee79 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,6 @@ # configure base tinc class tinc( - $manage_shorewall = false, + $use_shorewall = false, $key_source_path = '/var/lib/puppet/tinc_keys', ) { if $::operatingsystem == 'CentOS' and $::operatingsystemmajrelease > 6 { @@ -13,7 +13,7 @@ class tinc( debian: { include tinc::debian } default: { include tinc::base } } - if $manage_shorewall { + if $use_shorewall { include shorewall::rules::tinc } } diff --git a/manifests/switch.pp b/manifests/switch.pp index c3f58d4..0d7827c 100644 --- a/manifests/switch.pp +++ b/manifests/switch.pp @@ -63,7 +63,7 @@ define tinc::switch( } - if $tinc::manage_shorewall { + if $tinc::use_shorewall { $zone = $shorewall_zone ? { 'absent' => 'loc', default => $shorewall_zone