Getting closer to a working raspap install.

jeffeb3 · Nov 30, 2019 · cb8fe62 · cb8fe62
1 parent f6e87c8
commit cb8fe62
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/src/modules/raspap/config b/src/modules/raspap/config
@@ -2,5 +2,5 @@
 # All our config settings must start with RASPAP
 
 # RASPAP Script
-[ -n "$RASPAP_URL" ]  || RASPAP_URL="https://install.raspap.com"
+[ -n "$RASPAP_HOTSPOT_NAME" ] || RASPAP_HOTSPOT_NAME=${DIST_NAME,,}
 
diff --git a/src/modules/raspap/start_chroot_script b/src/modules/raspap/start_chroot_script
@@ -50,12 +50,18 @@ www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/wifidata /etc/wpa_supplicant/wpa_suppli
 www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] scan_results
 www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] scan
 www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] reconfigure
+www-data ALL=(ALL) NOPASSWD:/sbin/wpa_cli -i wlan[0-9] select_network
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/hostapddata /etc/hostapd/hostapd.conf
-www-data ALL=(ALL) NOPASSWD:/etc/init.d/hostapd start
-www-data ALL=(ALL) NOPASSWD:/etc/init.d/hostapd stop
-www-data ALL=(ALL) NOPASSWD:/etc/init.d/dnsmasq start
-www-data ALL=(ALL) NOPASSWD:/etc/init.d/dnsmasq stop
-www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dnsmasq.conf
+www-data ALL=(ALL) NOPASSWD:/bin/systemctl start hostapd.service
+www-data ALL=(ALL) NOPASSWD:/bin/systemctl stop hostapd.service
+www-data ALL=(ALL) NOPASSWD:/bin/systemctl start dnsmasq.service
+www-data ALL=(ALL) NOPASSWD:/bin/systemctl stop dnsmasq.service
+www-data ALL=(ALL) NOPASSWD:/bin/systemctl start openvpn-client@client
+www-data ALL=(ALL) NOPASSWD:/bin/systemctl stop openvpn-client@client
+www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/openvpn.ovpn /etc/openvpn/client/client.conf
+www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/authdata /etc/openvpn/client/login.conf
+www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.conf
+www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dhcpcd.conf
 www-data ALL=(ALL) NOPASSWD:/sbin/shutdown -h now
 www-data ALL=(ALL) NOPASSWD:/sbin/reboot
 www-data ALL=(ALL) NOPASSWD:/sbin/ip link set wlan[0-9] down
@@ -65,6 +71,8 @@ www-data ALL=(ALL) NOPASSWD:/bin/cp /etc/raspap/networking/dhcpcd.conf /etc/dhcp
 www-data ALL=(ALL) NOPASSWD:/etc/raspap/hostapd/enablelog.sh
 www-data ALL=(ALL) NOPASSWD:/etc/raspap/hostapd/disablelog.sh
 www-data ALL=(ALL) NOPASSWD:/etc/raspap/hostapd/servicestart.sh
+www-data ALL=(ALL) NOPASSWD:/etc/raspap/lighttpd/configport.sh
+www-data ALL=(ALL) NOPASSWD:/etc/raspap/openvpn/configauth.sh
 EOT
 
 echo "--- RaspAP Hostapd Install"
@@ -74,6 +82,22 @@ mv /var/www/html/installers/service*.sh /etc/raspap/hostapd
 chown -c root:www-data /etc/raspap/hostapd/*.sh
 chmod 750 /etc/raspap/hostapd/*.sh
 
+echo "--- RaspAP Configuration"
+mv /var/www/html/config/default_hostapd /etc/default/hostapd
+mv /var/www/html/config/hostapd.conf /etc/hostapd/hostapd.conf
+mv /var/www/html/config/dnsmasq.conf /etc/dnsmasq.conf
+mv /var/www/html/config/dhcpcd.conf /etc/dhcpcd.conf
+mv /var/www/html/config/config.php /var/www/html/includes/
+
+sed -i 's@\(server.port\s*=\s*\)80@\18080@' /etc/lighttpd/lighttpd.conf
+sed -i 's@raspi-webgui@$RASPAP_HOTSPOT_NAME@' /etc/hostapd/hostapd.conf
+
+echo "--- RaspAP PHP Optimization"
+sed -i -E 's/^session\.cookie_httponly\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/session.cookie_httponly = 1/' /etc/php/7.1/cgi/php.ini
+sed -i -E 's/^;?opcache\.enable\s*=\s*(0|([O|o]ff)|([F|f]alse)|([N|n]o))\s*$/opcache.enable = 1/' /etc/php/7.1/cgi/php.ini
+phpenmod opcache
+
+echo "--- RaspAP rc.local Configuration"
 sed -i 's@exit 0@@' /etc/rc.local
 cat <<'EOT' >> /etc/rc.local
 echo 1 > /proc/sys/net/ipv4/ip_forward #RASPAP
@@ -82,6 +106,7 @@ iptables -t nat -A POSTROUTING -s 192.168.50.0/24 ! -d 192.168.50.0/24 -j MASQUE
 EOT
 echo 'exit 0' >> /etc/rc.local
 
+echo "--- RaspAP hostapd services"
 systemctl unmask hostapd.service
 systemctl enable hostapd.service