From 37f097b20f7e9670c36ab0f7450d184aff720051 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Thu, 9 Apr 2020 15:17:30 -0400 Subject: [PATCH] tweaks --- scripts/services/Mistborn-raspap.service | 2 +- scripts/subinstallers/raspap.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/services/Mistborn-raspap.service b/scripts/services/Mistborn-raspap.service index 755663f..5afbe5e 100644 --- a/scripts/services/Mistborn-raspap.service +++ b/scripts/services/Mistborn-raspap.service @@ -8,9 +8,9 @@ Restart=always User=root Group=docker PermissionsStartOnly=true +ExecStartPre=/bin/bash /opt/mistborn_volumes/extra/raspap/etc-raspap/hostapd/servicestart.sh --interface uap0 --seconds 3 # Shutdown container (if running) when unit is stopped ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/extra/raspap.yml down -ExecStartPre=/bin/bash /opt/mistborn_volumes/extra/raspap/etc-raspap/hostapd/servicestart.sh --interface uap0 --seconds 3 # Start container when unit is started ExecStart=/usr/local/bin/docker-compose -f /opt/mistborn/extra/raspap.yml up --build diff --git a/scripts/subinstallers/raspap.sh b/scripts/subinstallers/raspap.sh index b0e4535..f425a56 100755 --- a/scripts/subinstallers/raspap.sh +++ b/scripts/subinstallers/raspap.sh @@ -40,15 +40,15 @@ sudo cp $TMP_DIR/config/dhcpcd.conf /etc/dhcpcd.conf #sudo cp config/config.php /var/www/html/includes/ # systemd-networkd -sudo systemctl stop systemd-networkd -sudo systemctl disable systemd-networkd +sudo systemctl stop systemd-networkd || true +sudo systemctl disable systemd-networkd || true sudo cp $TMP_DIR/config/raspap-bridge-br0.netdev /etc/systemd/network/raspap-bridge-br0.netdev sudo cp $TMP_DIR/config/raspap-br0-member-eth0.network /etc/systemd/network/raspap-br0-member-eth0.network -# enable packet forwarding -echo "net.ipv4.ip_forward=1" | sudo tee /etc/sysctl.d/90_raspap.conf > /dev/null -sudo sysctl -p /etc/sysctl.d/90_raspap.conf -sudo /etc/init.d/procps restart +## enable packet forwarding +#echo "net.ipv4.ip_forward=1" | sudo tee /etc/sysctl.d/90_raspap.conf > /dev/null +#sudo sysctl -p /etc/sysctl.d/90_raspap.conf +#sudo /etc/init.d/procps restart ## iptables #sudo iptables -t nat -A POSTROUTING -j MASQUERADE