up-to-date

pi-gen/stageDTPM3/00-install-packages/00-packages-nr

@@ -5,6 +5,7 @@ pkg-config
 libreadline-dev
 gcc-arm-none-eabi
 libnewlib-dev
+liblz4-dev
 libbz2-dev
 libbluetooth-dev
 libpython3-dev
@@ -18,3 +19,5 @@ qrencode
 php8.2-cgi
 openvpn
 wireguard
+jq
+isoquery

pi-gen/stageDTPM3/02-Wireless-AP/00-run-chroot.sh

@@ -3,11 +3,11 @@
 #rfkill unblock wan
 
 lighttpd-enable-mod fastcgi-php
-service lighttpd force-reload
+service lighttpd force-reload || true
 systemctl restart lighttpd.service
 
-rm -rf /var/ww/html
+rm -rf /var/www/html
-git clone httpsds://github.com/RaspAP/raspap-webgui /var/www/html
+git clone https://github.com/RaspAP/raspap-webgui /var/www/html
 
 WEBROOT="/var/www/html"
 CONFSRC="$WEBROOT/config/50-raspap-router.conf"
@@ -25,11 +25,10 @@ cd /var/www/html
 cp installers/raspap.sudoers /etc/sudoers.d/090_raspap
 
 mkdir -p /etc/raspap/backups
-mkdir -p /etc/raspap/networking
+mkdir /etc/raspap/networking
-mkdir -p /etc/raspap/hostapd
+mkdir /etc/raspap/hostapd
-mkdir -p /etc/raspap/lighttpd
+mkdir /etc/raspap/lighttpd
-
+mkdir /etc/raspap/system
-cp raspap.php /etc/raspap
 
 chown -R www-data:www-data /var/www/html
 chown -R www-data:www-data /etc/raspap
@@ -44,12 +43,11 @@ cp installers/configport.sh /etc/raspap/lighttpd
 chown -c root:www-data /etc/raspap/lighttpd/*.sh
 
 mv installers/raspapd.service /lib/systemd/system
-systemctl daemon-reload
+systemctl daemon-reload || true
 systemctl enable raspapd.service
 
-mv /etc/default/hostapd ~/default_hostapd.old
+cp /etc/hostapd/hostapd.conf ~/hostapd.conf.old || true
-cp /etc/hostapd/hostapd.conf ~/hostapd.conf.old
+cp config/default_hostapd /etc/default/hostapd || true
-cp config/default_hostapd /etc/default/hostapd
 cp config/hostapd.conf /etc/hostapd/hostapd.conf
 cp config/090_raspap.conf /etc/dnsmasq.d/090_raspap.conf
 cp config/090_wlan0.conf /etc/dnsmasq.d/090_wlan0.conf
@@ -57,16 +55,17 @@ cp config/dhcpcd.conf /etc/dhcpcd.conf
 cp config/config.php /var/www/html/includes/
 cp config/defaults.json /etc/raspap/networking/
 
+
 systemctl stop sytstemd-networkd
 systemctl disable systemd-networkd
-cp config/raspap-bridge-br0-netdev /etc/systemd/network/raspap-bridge-br0.netdev
+cp config/raspap-bridge-br0.netdev /etc/systemd/network/raspap-bridge-br0.netdev
 cp config/raspap-br0-member-eth0.network /etc/systemd/network/raspap-br0-member-eth0.network 
 
-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.4/cgi/php.ini
+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/8.2/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.4/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/8.2/cgi/php.ini
 phpenmod opcache
 
-echo "net.ipv4.ip_forward=1" > /etc/sysctl.d/90_raspap.conf 
+echo "net.ipv4.ip_forward=1" | tee /etc/sysctl.d/90_raspap.conf > /dev/null
 sysctl -p /etc/sysctl.d/90_raspap.conf
 /etc/init.d/procps restart
 
@@ -76,29 +75,3 @@ iptables-save > /etc/iptables/rules.v4
 
 systemctl unmask hostapd.service
 systemctl enable hostapd.service
-
-sed -i "s/\('RASPI_OPENVPN_ENABLED', \)false/\1true/g" /var/www/html/includes/config.php
-systemctl enable openvpn-client@client
-
-mkdir -p /etc/raspap/openvpn/
-cp installers/configauth.sh /etc/raspap/openvpn/
-chown -c root:www-data /etc/raspap/openvpn/*.sh 
-chmod 750 /etc/raspap/openvpn/*.sh
-
-sed -i "s/\('RASPI_WIREGUARD_ENABLED', \)false/\1true/g" /var/www/html/includes/config.php
-systemctl enable wg-quick@wg
-
-mkdir -p /etc/raspap/adblock
-wget https://raw.githubusercontent.com/notracking/hosts-blocklists/master/hostnames.txt -O /tmp/hostnames.txt
-wget https://raw.githubusercontent.com/notracking/hosts-blocklists/master/domains.txt -O /tmp/domains.txt
-cp /tmp/hostnames.txt /etc/raspap/adblock
-cp /tmp/domains.txt /etc/raspap/adblock 
-cp installers/update_blocklist.sh /etc/raspap/adblock/
-chown -c root:www-data /etc/raspap/adblock/*.*
-chmod 750 /etc/raspap/adblock/*.sh
-touch /etc/dnsmasq.d/090_adblock.conf
-echo "conf-file=/etc/raspap/adblock/domains.txt" > /etc/dnsmasq.d/090_adblock.conf
-echo "addn-hosts=/etc/raspap/adblock/hostnames.txt" > /etc/dnsmasq.d/090_adblock.conf
-sed -i '/dhcp-option=6/d' /etc/dnsmasq.d/090_raspap.conf
-sed -i "s/\('RASPI_ADBLOCK_ENABLED', \)false/\1true/g" includes/config.php
-