diff options
| author | varac <varacanero@zeromail.org> | 2013-10-17 16:54:02 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-10-17 16:54:02 +0200 |
| commit | 1cb05456bdf659ae8869abd166fb7afc3e2345c8 (patch) | |
| tree | e72e28585b694e8c09d3018314c971d1135a91c6 /puppet/modules | |
| parent | adbecc3cacc557e5d62546cbb203fdbbe3d54e3b (diff) | |
| parent | 99df31cdd58ca60b90c0098b126903e2d8251128 (diff) | |
Merge branch 'feature/4158_vagrant__support_other_provider' into develop
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_shorewall/manifests/defaults.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/modules/site_shorewall/manifests/defaults.pp b/puppet/modules/site_shorewall/manifests/defaults.pp index 6a40d501..8f56ac42 100644 --- a/puppet/modules/site_shorewall/manifests/defaults.pp +++ b/puppet/modules/site_shorewall/manifests/defaults.pp @@ -4,7 +4,9 @@ class site_shorewall::defaults { include site_config::params # be safe for development - #if ( $::virtual == 'virtualbox') { $shorewall_startup='0' } + # if ( $::site_config::params::environment == 'local' ) { + # $shorewall_startup='0' + # } # If you want logging: shorewall::params { |