From f2abb4776b3e509c0ff51dc4b3a7162983c5a295 Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Tue, 17 Nov 2020 12:11:12 -0500
Subject: [PATCH] service

---
 extra/raspap.yml                         |  8 ++--
 scripts/services/Mistborn-raspap.service |  2 +-
 scripts/subinstallers/raspap.sh          | 60 ------------------------
 3 files changed, 5 insertions(+), 65 deletions(-)
 delete mode 100755 scripts/subinstallers/raspap.sh

diff --git a/extra/raspap.yml b/extra/raspap.yml
index d4fdea1..31dd6f4 100644
--- a/extra/raspap.yml
+++ b/extra/raspap.yml
@@ -19,11 +19,11 @@ services:
     #  - ../.envs/.production/.pihole
     cap_add:
       #- NET_ADMIN
-      #- SYS_ADMIN
-      - CAP_FOWNER
+      - SYS_ADMIN
+      #- CAP_FOWNER
+    privileged: true
     volumes:
-      - ../../mistborn_volumes/extra/raspap/etc-raspap:/etc/raspap
-      - /sys:/sys
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     #command: /start
     restart: unless-stopped
 
diff --git a/scripts/services/Mistborn-raspap.service b/scripts/services/Mistborn-raspap.service
index c919d24..6b9cca8 100644
--- a/scripts/services/Mistborn-raspap.service
+++ b/scripts/services/Mistborn-raspap.service
@@ -9,7 +9,7 @@ User=root
 Group=docker
 PermissionsStartOnly=true
 ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 8095 -j MISTBORN_LOG_DROP
-ExecStartPre=/bin/bash /opt/mistborn_volumes/extra/raspap/etc-raspap/hostapd/servicestart.sh --interface uap0 --seconds 3
+#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
 
diff --git a/scripts/subinstallers/raspap.sh b/scripts/subinstallers/raspap.sh
deleted file mode 100755
index 9e618cb..0000000
--- a/scripts/subinstallers/raspap.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-RASPAP_VOL=/opt/mistborn_volumes/extra/raspap/etc-raspap
-TMP_DIR=/tmp/mistborn-raspap
-
-# install on gateway
-sudo apt-get install -y hostapd vnstat
-
-# install dhcp server on Ubuntu, Debian, etc. (just not Raspbian)
-if [ ! "$DISTRO" == "raspbian" ]; then
-    sudo apt-get install -y dhcpcd5
-fi
-
-sudo mkdir -p $RASPAP_VOL 
-sudo mkdir -p $RASPAP_VOL/backups
-sudo mkdir -p $RASPAP_VOL/networking
-sudo mkdir -p $RASPAP_VOL/hostapd
-#sudo mkdir -p $RASPAP_VOL/lighttpd
-
-sudo cat /etc/dhcpcd.conf | sudo tee -a $RASPAP_VOL/networking/defaults > /dev/null
-
-# copy files from raspap repo
-sudo git clone https://github.com/sfoerster/raspap-webgui.git -b raspap_container $TMP_DIR
-sudo cp $TMP_DIR/raspap.php $RASPAP_VOL
-
-sudo mv $TMP_DIR/installers/*log.sh $RASPAP_VOL/hostapd
-sudo mv $TMP_DIR/installers/service*.sh $RASPAP_VOL/hostapd
-#sudo cp $TMP_DIR/installers/configport.sh $RASPAP_VOL/lighttpd
-
-### System Service ###
-#sudo mv $TMP_DIR/installers/raspapd.service /lib/systemd/system
-
-sudo mv /etc/default/hostapd ~/default_hostapd.old
-sudo cp /etc/hostapd/hostapd.conf ~/hostapd.conf.old
-
-sudo cp $TMP_DIR/config/default_hostapd /etc/default/hostapd
-sudo cp $TMP_DIR/config/hostapd.conf /etc/hostapd/hostapd.conf
-sudo cp $TMP_DIR/config/dnsmasq.conf /etc/dnsmasq.d/090_raspap.conf
-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 || 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
-
-## iptables
-#sudo iptables -t nat -A POSTROUTING -j MASQUERADE
-#sudo iptables -t nat -A POSTROUTING -s 192.168.50.0/24 ! -d 192.168.50.0/24 -j MASQUERADE
-#sudo iptables-save | sudo tee /etc/iptables/rules.v4
-
-# hostapd
-sudo systemctl unmask hostapd.service
-sudo systemctl enable hostapd.service