From 08ace7d699999b07530f31fd258558795af3d191 Mon Sep 17 00:00:00 2001 From: v3d Date: Thu, 5 May 2022 16:41:50 +0000 Subject: [PATCH 1/7] Fix path in hotspot --- usr/local/bin/hotspot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/bin/hotspot b/usr/local/bin/hotspot index 6c9c0d9..0fa5ba4 100755 --- a/usr/local/bin/hotspot +++ b/usr/local/bin/hotspot @@ -11,7 +11,7 @@ sudo cp -f /home/pi/pivilion/config/hostapd.hotspot /etc/hostapd/hostapd.conf sudo cp -f /home/pi/pivilion/config/dnsmasq.hotspot /etc/dnsmasq.conf sudo cp -rf /home/pi/pivilion/config/html /var/www/html/gen sudo chown -R www-data:www-data /var/www/html -sudo chown root:www-data /var/www/htmlgen//.htaccess +sudo chown root:www-data /var/www/html/gen/.htaccess sudo cp -f /home/pi/pivilion/config/rc.hotspot /etc/rc.local sudo cp -f /home/pi/pivilion/config/override.hotspot /etc/apache2/conf-available/override.conf sudo a2enconf override From 69fb063070b40e6da536289e5dcd43bd9627f722 Mon Sep 17 00:00:00 2001 From: v3d Date: Thu, 5 May 2022 16:54:44 +0000 Subject: [PATCH 2/7] Fix path in hotspot --- usr/local/bin/hotspot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/local/bin/hotspot b/usr/local/bin/hotspot index 0fa5ba4..2925419 100755 --- a/usr/local/bin/hotspot +++ b/usr/local/bin/hotspot @@ -9,9 +9,9 @@ fi echo "Configuring components..." sudo cp -f /home/pi/pivilion/config/hostapd.hotspot /etc/hostapd/hostapd.conf sudo cp -f /home/pi/pivilion/config/dnsmasq.hotspot /etc/dnsmasq.conf -sudo cp -rf /home/pi/pivilion/config/html /var/www/html/gen +sudo cp -rf /home/pi/pivilion/config/html /var/www/html/pivilion/gen sudo chown -R www-data:www-data /var/www/html -sudo chown root:www-data /var/www/html/gen/.htaccess +sudo chown root:www-data /var/www/html/pivilion/gen/.htaccess sudo cp -f /home/pi/pivilion/config/rc.hotspot /etc/rc.local sudo cp -f /home/pi/pivilion/config/override.hotspot /etc/apache2/conf-available/override.conf sudo a2enconf override From 40c8d05263160ff7b1afb279aeb1b0e1b4ac8fb5 Mon Sep 17 00:00:00 2001 From: v3d Date: Thu, 5 May 2022 16:55:56 +0000 Subject: [PATCH 3/7] Fixed hashbang in hotspot --- usr/local/bin/hotspot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/bin/hotspot b/usr/local/bin/hotspot index 2925419..07a9f13 100755 --- a/usr/local/bin/hotspot +++ b/usr/local/bin/hotspot @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash echo "Checking for required packages and installing if missing" if [ $(dpkg-query -W -f='${Status}' apache2 2>/dev/null | grep -c "ok installed") -eq 0 ]; From 9cb11c705dd99aee04b2e1b8031577616d1c9ccb Mon Sep 17 00:00:00 2001 From: v3d Date: Thu, 5 May 2022 17:37:17 +0000 Subject: [PATCH 4/7] fix path --- usr/local/bin/hotspot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/bin/hotspot b/usr/local/bin/hotspot index 07a9f13..36a557f 100755 --- a/usr/local/bin/hotspot +++ b/usr/local/bin/hotspot @@ -9,7 +9,7 @@ fi echo "Configuring components..." sudo cp -f /home/pi/pivilion/config/hostapd.hotspot /etc/hostapd/hostapd.conf sudo cp -f /home/pi/pivilion/config/dnsmasq.hotspot /etc/dnsmasq.conf -sudo cp -rf /home/pi/pivilion/config/html /var/www/html/pivilion/gen +sudo cp -rf /home/pi/pivilion/config/html/* /var/www/html/pivilion/gen sudo chown -R www-data:www-data /var/www/html sudo chown root:www-data /var/www/html/pivilion/gen/.htaccess sudo cp -f /home/pi/pivilion/config/rc.hotspot /etc/rc.local From b724dbc829f7a9605abba8665531c8a237c36a64 Mon Sep 17 00:00:00 2001 From: v3d Date: Thu, 5 May 2022 17:47:02 +0000 Subject: [PATCH 5/7] Fixed cp lol --- usr/local/bin/hotspot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/bin/hotspot b/usr/local/bin/hotspot index 36a557f..de896e7 100755 --- a/usr/local/bin/hotspot +++ b/usr/local/bin/hotspot @@ -9,7 +9,7 @@ fi echo "Configuring components..." sudo cp -f /home/pi/pivilion/config/hostapd.hotspot /etc/hostapd/hostapd.conf sudo cp -f /home/pi/pivilion/config/dnsmasq.hotspot /etc/dnsmasq.conf -sudo cp -rf /home/pi/pivilion/config/html/* /var/www/html/pivilion/gen +sudo cp -f /home/pi/pivilion/config/html/* /var/www/html/pivilion/gen sudo chown -R www-data:www-data /var/www/html sudo chown root:www-data /var/www/html/pivilion/gen/.htaccess sudo cp -f /home/pi/pivilion/config/rc.hotspot /etc/rc.local From 303ff7a081e2718044a33b80de8edd2d89c9c0e2 Mon Sep 17 00:00:00 2001 From: v3d Date: Thu, 5 May 2022 17:52:06 +0000 Subject: [PATCH 6/7] Fix cp command to include hidden files --- usr/local/bin/hotspot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/bin/hotspot b/usr/local/bin/hotspot index de896e7..0c89ed5 100755 --- a/usr/local/bin/hotspot +++ b/usr/local/bin/hotspot @@ -9,7 +9,7 @@ fi echo "Configuring components..." sudo cp -f /home/pi/pivilion/config/hostapd.hotspot /etc/hostapd/hostapd.conf sudo cp -f /home/pi/pivilion/config/dnsmasq.hotspot /etc/dnsmasq.conf -sudo cp -f /home/pi/pivilion/config/html/* /var/www/html/pivilion/gen +sudo cp -rT /home/pi/pivilion/config/html /var/www/html/pivilion/gen sudo chown -R www-data:www-data /var/www/html sudo chown root:www-data /var/www/html/pivilion/gen/.htaccess sudo cp -f /home/pi/pivilion/config/rc.hotspot /etc/rc.local From 4ac188ca3311847699854747c80e2168e381fb73 Mon Sep 17 00:00:00 2001 From: v3d Date: Thu, 5 May 2022 17:55:26 +0000 Subject: [PATCH 7/7] fix onion --- usr/local/bin/onion | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/local/bin/onion b/usr/local/bin/onion index 9c104ea..956fad2 100755 --- a/usr/local/bin/onion +++ b/usr/local/bin/onion @@ -9,8 +9,8 @@ sudo update-rc.d dnsmasq disable sudo bash -c 'cat /home/pi/pivilion/config/rc.local.onion > /etc/rc.local' sudo mv /etc/wpa_supplicant/wpa_supplicant.bak /etc/wpa_supplicant/wpa_supplicant.conf sudo rm /var/www/html/pivilion/gen/.htaccess -echo "The next time you reboot, your Pi will start in onion mode"! -echo "Your onion domain is `cat /home/pi/pivilion/torname`" +sudo echo "The next time you reboot, your Pi will start in onion mode"! +sudo echo "Your onion domain is `cat /home/pi/pivilion/torname`" sudo bash -c 'echo "onion" > /home/pi/pivilion/mode'