From e1f5d4bb099e2172553d871bd0c5269f929d7a31 Mon Sep 17 00:00:00 2001 From: v3d Date: Wed, 11 May 2022 00:07:17 +0200 Subject: [PATCH] new scripts and sort /etc --- usr/local/bin/generator | 22 +++++++++++++++++ usr/local/bin/hotglue | 53 +++++++++++++++++++++++------------------ usr/local/bin/hotspot | 3 ++- usr/local/bin/htaccess | 9 +++++++ usr/local/bin/static | 18 ++++++++++++++ 5 files changed, 81 insertions(+), 24 deletions(-) create mode 100755 usr/local/bin/generator create mode 100755 usr/local/bin/htaccess create mode 100755 usr/local/bin/static diff --git a/usr/local/bin/generator b/usr/local/bin/generator new file mode 100755 index 0000000..9988a4f --- /dev/null +++ b/usr/local/bin/generator @@ -0,0 +1,22 @@ +#!/bin/bash + +echo "Would you like to enable or disable the Static Generator Script?" + select stagen in "Enable" "Disable"; do + case $stagen in + Enable ) sudo a2ensite 000-upload.conf > /dev/null; + sudo systemctl reload apache2; + echo "Static Generator Script enabled, access it by adding :81 to your Rpi IP in your browser"; + sudo chown -R pi:pi /home/pi + sudo chown -R www-data:www-data /var/www/; + sudo chmod -R 775 /var/www; + break;; + Disable ) sudo a2dissite 000-upload.conf > /dev/null; + sudo systemctl reload apache2; + echo "Static Generator Script disabled"; + sudo chown -R pi:pi /home/pi + sudo chown -R www-data:www-data /var/www/; + sudo chmod -R 775 /var/www; + break;; + esac + done +exit 0 diff --git a/usr/local/bin/hotglue b/usr/local/bin/hotglue index 6f41513..7e016ea 100755 --- a/usr/local/bin/hotglue +++ b/usr/local/bin/hotglue @@ -1,25 +1,32 @@ #!/bin/bash -FILE=/home/pi/pivilion/hotglue/hotglue-latest-dev.zip -if [ -f "$FILE" ]; then - echo "Hotglue already installed, restoring installation." - sudo zip /home/pi/pivilion/hotglue/gen.backup.zip /var/www/html/pivilion/gen - sudo rm -rf /var/www/html/gen/{,.[!.],..?}* - sudo cp -rT /home/pi/pivilion/hotglue /var/www/html/pivilion/gen - sudo chmod 777 /var/www/html/pivilion/gen/content -else - wget https://hotglue.org/download/hotglue-latest-dev.zip -P /home/pi/pivilion/hotglue/ - unzip /home/pi/pivilion/hotglue/hotglue-latest-dev.zip -d /home/pi/pivilion/hotglue/ - sudo mv /home/pi/pivilion/hotglue/k0a1a-hotglue2-ff69c8d/{,.[!.],..?}* /home/pi/pivilion/hotglue/ - echo "Enter admin user" - read user - echo "Enter password" - read password - echo -e " /home/pi/pivilion/hotglue/user-config.inc.php - sudo mv /home/pi/pivilion/hotglue/htaccess-dist /home/pi/pivilion/hotglue/.htaccess - sudo zip /home/pi/pivilion/hotglue/gen.backup.zip /var/www/html/pivilion/gen - sudo rm -rf /var/www/html/pivilion/gen/{,.[!.],..?}* - sudo cp -rT /home/pi/pivilion/hotglue /var/www/html/pivilion/gen - sudo chmod 777 /var/www/html/pivilion/gen/content -fi - +echo "Would you like to install or restore Hotglue? Installing will overwrite any existing files in /var/www/html/pivilion/gen" + select sres in "Install" "Restore"; do + case $sres in + Install ) wget https://hotglue.org/download/hotglue-latest-dev.zip -P /home/pi/pivilion/hotglue/; + unzip /home/pi/pivilion/hotglue/hotglue-latest-dev.zip -d /home/pi/pivilion/hotglue/; + sudo mv /home/pi/pivilion/hotglue/k0a1a-*/* /home/pi/pivilion/hotglue/; + echo "Enter Hotglue admin user"; + read user; + echo "Enter Hotglue admin password"; + read password; + echo -e " /home/pi/pivilion/hotglue/user-config.inc.php + sudo mv /home/pi/pivilion/hotglue/htaccess-dist /home/pi/pivilion/hotglue/.htaccess; + sudo rm -rf /var/www/html/pivilion/gen/{,.[!.],..?}*; + sudo cp -rT /home/pi/pivilion/hotglue /var/www/html/pivilion/gen; + sudo chmod 777 /var/www/html/pivilion/gen/content; + sudo chown -R pi:pi /home/pi; + sudo chown -R www-data:www-data /var/www/; + sudo chmod -R 775 /var/www; + break;; + Restore ) sudo rm -rf /var/www/html/pivilion/gen/{,.[!.],..?}*; + sudo cp -aR /home/pi/pivilion/hotglue/backup /var/www/html/pivilion/gen; + sudo mv /var/www/html/pivilion/gen/backup/* /var/www/html/pivilion/gen + sudo chmod -R 777 /var/www/html/pivilion/gen/content; + sudo chown -R pi:pi /home/pi; + sudo chown -R www-data:www-data /var/www/; + sudo chmod -R 775 /var/www; + break;; + esac + done exit 0 + diff --git a/usr/local/bin/hotspot b/usr/local/bin/hotspot index 0c89ed5..da82ff3 100755 --- a/usr/local/bin/hotspot +++ b/usr/local/bin/hotspot @@ -5,11 +5,12 @@ if [ $(dpkg-query -W -f='${Status}' apache2 2>/dev/null | grep -c "ok installed" then sudo apt update sudo apt -y install hostapd dnsmasq apache2 php + sudo cp -rT /home/pi/pivilion/config/html /var/www/html/pivilion/gen 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 -rT /home/pi/pivilion/config/html /var/www/html/pivilion/gen +sudo cp /home/pi/pivilion/config/html/.htaccess /var/www/html/pivilion/gen/.htaccess 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 diff --git a/usr/local/bin/htaccess b/usr/local/bin/htaccess new file mode 100755 index 0000000..6c68983 --- /dev/null +++ b/usr/local/bin/htaccess @@ -0,0 +1,9 @@ +#!/bin/bash + +echo "Would you like to remove or reset htaccess redirection" + select hson in "Reset" "Remove"; do + case $hson in + Reset) sudo cp /home/pi/pivilion/config/html/.htaccess /var/www/html/pivilion/gen; break;; + Remove) sudo rm /var/www/html/pivilion/gen/.htaccess; break;; + esac +done diff --git a/usr/local/bin/static b/usr/local/bin/static new file mode 100755 index 0000000..1ded5c7 --- /dev/null +++ b/usr/local/bin/static @@ -0,0 +1,18 @@ +#!/bin/bash + sudo rm -rf /home/pi/pivilion/static/{,.[!.],..?}* + sudo cp -a -R /var/www/html/pivilion/gen /home/pi/pivilion/hotglue/backup + wget --mirror --convert-links --adjust-extension --page-requisites --restrict-file-names=ascii,windows http://127.0.0.1 -P /home/pi/pivilion/static + sudo rm -rf /var/www/html/pivilion/gen/{,.[!.],..?}* + sudo cp -rT /home/pi/pivilion/static/127.0.0.1 /var/www/html/pivilion/gen + sudo mv /var/www/html/pivilion/gen/index.html //var/www/html/pivilion/gen/index.php + sudo chown -R pi:pi /home/pi + sudo chown -R www-data:www-data /var/www/; + sudo chmod -R 775 /var/www; + echo "Are you using static HTML with hotspot or onion mode?" + select hson in "Hotspot" "Onion"; do + case $hson in + Hotspot ) sudo cp /home/pi/pivilion/config/html/.htaccess /var/www/html/pivilion/gen; break;; + Onion ) sudo rm /var/www/html/pivilion/gen/.htaccess; break;; + esac + done +exit 0