diff options
| author | varac <varacanero@zeromail.org> | 2012-11-06 11:14:28 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-11-06 11:14:28 +0100 |
| commit | b08f959aa17f05821a6a4a58266b9250cdc59cbb (patch) | |
| tree | 9ea7c7eb5abd913ccbcb2f7f97bff8e48851c474 | |
| parent | 1493ca871a596380f3db6feeb2c0621a597d4f30 (diff) | |
fixed unseen merge conflicts
| -rw-r--r-- | puppet/modules/site_shorewall/manifests/eip.pp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/puppet/modules/site_shorewall/manifests/eip.pp b/puppet/modules/site_shorewall/manifests/eip.pp index 7dee6b7a..20e22cb3 100644 --- a/puppet/modules/site_shorewall/manifests/eip.pp +++ b/puppet/modules/site_shorewall/manifests/eip.pp @@ -75,9 +75,6 @@ PARAM - - udp 1194 action => 'Ping(ACCEPT)', order => 200; -<<<<<<< HEAD - 'net2fw-openvpn_ssh': -======= # outside to server 'net2fw-ssh': source => 'net', @@ -85,7 +82,6 @@ PARAM - - udp 1194 action => 'SSH(ACCEPT)', order => 200; 'net2fw-openvpn': ->>>>>>> feature/couchdb source => 'net', destination => '$FW', action => 'leap_eip(ACCEPT)', @@ -108,14 +104,9 @@ PARAM - - udp 1194 action => 'Git(ACCEPT)', order => 200; -<<<<<<< HEAD - #'eip2fw-https': - # source => 'eip', -======= # Webfrontend is running on another server #'eip2fw-https': - # source => 'eip', ->>>>>>> feature/couchdb + # source => 'eip', # destination => '$FW', # action => 'HTTPS(ACCEPT)', # order => 200; |