Merge branch 'master' of ssh://gitlab.com/hacklab01/pivilion

This commit is contained in:
v3d 2022-05-05 20:46:14 +02:00
commit 3418ed7dac
2 changed files with 5 additions and 5 deletions

View File

@ -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 ];
@ -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 -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/htmlgen//.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

View File

@ -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'