From 1a9e69876006d789df6fb5597419ef38f864903e Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Fri, 21 Oct 2016 23:48:02 -0700 Subject: [PATCH] small fix and config change --- dsfull | 2 +- pxe-server | 1 + wrt-disabled-firewall-rules | 22 ---------------------- wrt-setup | 23 +++++++++++++++++++++++ 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dsfull b/dsfull index 51ecdda..e24c549 100755 --- a/dsfull +++ b/dsfull @@ -25,7 +25,7 @@ fi set -x -cleanup() { pxe-server :; } +cleanup() { pxe-server; } pxe-server $host fai diff --git a/pxe-server b/pxe-server index 4e4aaa8..66bc4ff 100755 --- a/pxe-server +++ b/pxe-server @@ -155,6 +155,7 @@ if $wait; then # bleh. echo "waiting for $acks dhcp acks then disabling pxe" ack-wait $acks + type= set-pxe # previously tried waiting for one more ack then disabling faiserver, diff --git a/wrt-disabled-firewall-rules b/wrt-disabled-firewall-rules index 3190f0b..c126d43 100644 --- a/wrt-disabled-firewall-rules +++ b/wrt-disabled-firewall-rules @@ -6,29 +6,7 @@ firewall rules, temporarily disabled until I get them working #http/https -config redirect - option src wan - option src_dport 443 - option dest lan - option dest_ip 192.168.1.2 - option proto tcp -config rule - option src wan - option target ACCEPT - option dest_port 443 - option proto tcp -config redirect - option src wan - option src_dport 80 - option dest lan - option dest_ip 192.168.1.2 - option proto tcp -config rule - option src wan - option target ACCEPT - option dest_port 80 - option proto tcp config redirect diff --git a/wrt-setup b/wrt-setup index b8d62f2..410c7a0 100755 --- a/wrt-setup +++ b/wrt-setup @@ -197,6 +197,29 @@ config rule option target ACCEPT option dest_port 2222 +config redirect + option src wan + option src_dport 443 + option dest lan + option dest_ip 192.168.1.2 + option proto tcp +config rule + option src wan + option target ACCEPT + option dest_port 443 + option proto tcp + +config redirect + option src wan + option src_dport 80 + option dest lan + option dest_ip 192.168.1.2 + option proto tcp +config rule + option src wan + option target ACCEPT + option dest_port 80 + option proto tcp EOF -- 2.30.2