diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp index 8a08089..8789de7 100644 --- a/manifests/firewall/iptables.pp +++ b/manifests/firewall/iptables.pp @@ -31,13 +31,13 @@ class cd_haproxy::firewall::iptables ( firewall { "${hy_fw_order_no}${hy_http_port} tcp port ${hy_http_port}": proto => 'tcp', dport => $hy_http_port, - action => 'accept', + jump => 'accept', } firewall { "${hy_fw_order_no}${hy_https_port} tcp port ${hy_https_port}": proto => 'tcp', dport => $hy_https_port, - action => 'accept', + jump => 'accept', } } } diff --git a/manifests/main/config.pp b/manifests/main/config.pp index 262f1e0..496aa44 100644 --- a/manifests/main/config.pp +++ b/manifests/main/config.pp @@ -26,6 +26,6 @@ class cd_haproxy::main::config ( ) inherits cd_haproxy::params { include cd_haproxy::server::service - include cd_haproxy::server::proxy_test +# include cd_haproxy::server::proxy_test } diff --git a/manifests/params.pp b/manifests/params.pp index 6a2ccb9..53d556f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -80,7 +80,7 @@ class cd_haproxy::params ( $pkg_ensure = 'latest', $reqpackages = ['haproxy'], -$hy_host_fqdn = "proxy.${::domain}", +$hy_host_fqdn = undef, # firewall $hy_manage_fw = true,