diff --git a/installers/common.sh b/installers/common.sh index 4cd29237..edbf6c18 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -281,8 +281,8 @@ function default_configuration() { fi echo "Enabling persistent IP tables rules" - if [ ! -f "/etc/iptables/iptables.rules" ]; then - sudo cp "$webroot_dir/installers/iptables.rules" /etc/iptables || install_error "Unable to move iptables.rules to /etc/iptables" + if [ ! -f "/etc/iptables.raspap.rules" ]; then + sudo cp "$webroot_dir/installers/iptables.rules" /etc/iptables.raspap.rules || install_error "Unable to move iptables.rules" fi if [ ! -f "/etc/systemd/system/iptables.service" ]; then diff --git a/installers/iptables.service b/installers/iptables.service index 992acba6..cba5608d 100644 --- a/installers/iptables.service +++ b/installers/iptables.service @@ -6,8 +6,8 @@ Before=sysinit.target [Service] Type=oneshot -ExecStart=/sbin/iptables-restore /etc/iptables/iptables.rules -ExecReload=/sbin/iptables-restore /etc/iptables/iptables.rules +ExecStart=/sbin/iptables-restore /etc/iptables.raspap.rules +ExecReload=/sbin/iptables-restore /etc/iptables.raspap.rules ExecStop=/etc/iptables/flush-iptables.sh RemainAfterExit=yes