b.waal/PiAutomation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Installer.sh

Browse Source 
Added Test Vars and enabled these vars for now.

Added extra Whiptail dialogs reflecting the status of the installer.

Fixed typo in HOST setup.
Added Var cleaner removing non AZ-09 characters.

Fixed wireless lan check, enabler and now showing the correct IP address!

Moved the uninstallment of the dphys-swapfile down where all unnecessary packages are removed to streamline the installer.

Removed check if nodered is active and running.

Fixed oopsie, added port 5002 to the UFW. Now ZB2MQTT is available.
Ordered UFW ports from highest to lowest.
Only open UFW ports if the service is selected in the Options menu.

Disabled X11 change in sshd_config

Set the display of the message to insert the Zigbee Dongle to only appear when ZB2MQTT is selected in the options menu.
This commit is contained in:
Beeranco 2023-08-16 19:25:58 +02:00 committed by GitHub
parent 572a51a78a
commit ebeebdb21e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 79 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Installer.sh
View File

@ -1,5 +1,14 @@
#!/bin/bash #!/bin/bash
##-------------##
# Test Vars #
##-------------##
AGREE=yes
SKIPinfo=yes
SKIPoptions=yes
OPTIONS='"Domoticz" "Node-RED" "Zigbee2MQTT" "MQTT-Broker" "Unattended-Upgrades" "Monitor-Service"'
##---------------## ##---------------##
# Static Vars # # Static Vars #
##---------------## ##---------------##
@ -59,10 +68,12 @@ fi
# Menu # # Menu #
##---------## ##---------##
if (whiptail --title "Pi Automation" --yesno "This installer will turn your Raspberry Pi into a hub for home automation." 8 78); then if [[ $AGREE != "yes" ]]; then
INSTALL=yes if (whiptail --title "Pi Automation" --yesno "This installer will turn your Raspberry Pi into a hub for home automation." 8 78); then
else INSTALL=yes
INSTALL=no else
INSTALL=no
fi
fi fi
if [[ $INSTALL == no ]]; then if [[ $INSTALL == no ]]; then
whiptail --title "Pi Automation" --msgbox "Installation canceled!" 8 78 whiptail --title "Pi Automation" --msgbox "Installation canceled!" 8 78
@ -70,8 +81,14 @@ if [[ $INSTALL == no ]]; then
exit exit
fi fi
if [[ $SKIPinfo != "yes" ]]; then
NAME=$(whiptail --nocancel --inputbox "What is your name?" 8 39 John --title "Welcome" 3>&1 1>&2 2>&3) NAME=$(whiptail --nocancel --inputbox "What is your name?" 8 39 John --title "Welcome" 3>&1 1>&2 2>&3)
HOST=$(whiptail --nocancel --inputbox "What is the name of this machine? (only az-AZ characters are allowd)" 8 39 Raspberry --title "Welcome $NAME!" 3>&1 1>&2 2>&3) HOST=$(whiptail --nocancel --inputbox "What is the name of this machine?\n(only az-AZ 0-9 characters are allowed)" 8 43 PiMation --title "Welcome $NAME!" 3>&1 1>&2 2>&3)
HOST=$(echo $HOST | tr -dc '[:alnum:]\n\r')
else
NAME=Tester
HOST=Admin
fi
##-------------## ##-------------##
# Pre-Check # # Pre-Check #
@ -92,21 +109,22 @@ fi
# Options # # Options #
##-----------## ##-----------##
OPTIONS=$(whiptail --title "Configure Options" --checklist \ if [[ $SKIPinfo != "yes" ]]; then
"What to install?" 12 113 6 \ OPTIONS=$(whiptail --title "Configure Options" --checklist \
"Domoticz" "Is a Home Automation System." ON \ "What to install?" 12 113 6 \
"Node-RED" "Is a programming tool wiring hardware devices together." OFF \ "Domoticz" "Is a Home Automation System." ON \
"Zigbee2MQTT" "Supports various Zigbee adapters and a big bunch of devices." OFF \ "Node-RED" "Is a programming tool wiring hardware devices together." OFF \
"MQTT-Broker" "Is a intermediary entity that enables MQTT clients to communicate." ON \ "Zigbee2MQTT" "Supports various Zigbee adapters and a big bunch of devices." OFF \
"Unattended-Upgrades" "Is a system package that automaticly downloads security updates." ON \ "MQTT-Broker" "Is a intermediary entity that enables MQTT clients to communicate." ON \
"Monitor-Service" "Autologin the Pi user and show system and service statuses. (usefull with TFT)" OFF 3>&1 1>&2 2>&3) "Unattended-Upgrades" "Is a system package that automaticly downloads security updates." ON \
"Monitor-Service" "Autologin the Pi user to show system and service statuses. (usefull with TFT)" OFF 3>&1 1>&2 2>&3)
fi
##-------------------## ##-------------------##
# Pre-Configuring # # Pre-Configuring #
##-------------------## ##-------------------##
TERM=ansi whiptail --title "Pi Automation" --infobox "Configuring Raspberry Pi" 8 78 TERM=ansi whiptail --title "Pi Automation" --infobox "Preparing the Raspberry Pi." 8 78
sleep 3 sleep 3
hostnamectl set-hostname $HOST hostnamectl set-hostname $HOST
@ -114,17 +132,16 @@ sed -i '/raspberrypi/d' /etc/hosts
echo "127.0.1.1 $HOST" >> /etc/hosts echo "127.0.1.1 $HOST" >> /etc/hosts
if grep -q "ssid=" /etc/wpa_supplicant/wpa_supplicant.conf if grep -q "ssid=" /etc/wpa_supplicant/wpa_supplicant.conf
then then {
IP=`hostname -I` && IP=$(echo $IP | cut -d ' ' -f 1) echo 0; sleep 1; rfkill unblock wifi; echo 20;
rfkill unblock wifi sleep 3; systemctl enable wpa_supplicant &> /dev/null && systemctl restart wpa_supplicant &> /dev/null; echo 40;
sleep 3; ip link set wlan0 up; echo 60; while true; do ping -I wlan0 -c1 1.1.1.1 &> /dev/null && break; done; echo 80;
sleep 3; echo 100; sleep 1; } | whiptail --title "Pi Automation" --gauge "Configuring wireless LAN. Please wait..." 6 70 0
IP=`hostname -I` && IP=$(echo $IP | cut -d' ' -f2,3)
else else
echo "country=NL" >> /etc/wpa_supplicant/wpa_supplicant.conf echo "country=NL" >> /etc/wpa_supplicant/wpa_supplicant.conf
rfkill unblock wifi IP=`hostname -I` && IP=$(echo $IP | cut -d ' ' -f 1)
systemctl restart wpa_supplicant rfkill unblock wifi
TERM=ansi whiptail --title "Pi Automation" --infobox "Configuring Wireless lan, please wait." 8 78
ip link set wlan0 up
sleep 30
IP=`hostname -I` && IP=$(echo $IP | cut -d' ' -f2,3)
fi fi
if grep -q "Amsterdam" <<< "$TZDATA"; then if grep -q "Amsterdam" <<< "$TZDATA"; then
@ -155,6 +172,9 @@ fi
# Pre-Installer # # Pre-Installer #
##-----------------## ##-----------------##
TERM=ansi whiptail --title "Pi Automation" --infobox "Preparing required packages." 8 78
sleep 3
(ls /dev/ttyACM0 >> /dev/null 2>&1) && USB=yes || USB=no (ls /dev/ttyACM0 >> /dev/null 2>&1) && USB=yes || USB=no
if [[ $USB == *"yes"* ]]; then if [[ $USB == *"yes"* ]]; then
whiptail --title "Error!" --msgbox "Remove the Zigbee Dongle first! After removal press OK to continue." 8 78 whiptail --title "Error!" --msgbox "Remove the Zigbee Dongle first! After removal press OK to continue." 8 78
@ -162,7 +182,7 @@ fi
TERM=ansi whiptail --title "Pi Automation" --infobox "Setup will begin with running updates and installing dependencies\nthis may take a while... Grab yourself a coffee!" 8 78 TERM=ansi whiptail --title "Pi Automation" --infobox "Setup will begin with running updates and installing dependencies\nthis may take a while... Grab yourself a coffee!" 8 78
sleep 3 sleep 3
dphys-swapfile swapoff ; dphys-swapfile uninstall ; update-rc.d dphys-swapfile remove ; apt purge dphys-swapfile -qq -y dphys-swapfile swapoff ; dphys-swapfile uninstall ; update-rc.d dphys-swapfile remove
systemctl disable ModemManager systemctl disable ModemManager
echo "python3-dev python3-pip" >> /tmp/install.list echo "python3-dev python3-pip" >> /tmp/install.list
@ -189,8 +209,11 @@ fi
# Updater # # Updater #
##-----------## ##-----------##
TERM=ansi whiptail --title "Pi Automation" --infobox "Updating packages." 8 78
sleep 3
$PKGUD $PKGUD
$PKRM manpages* p7zip* vim* pigz* strace* rng-tools* manpages* triggerhappy* $PKRM dphys-swapfile* manpages* p7zip* vim* pigz* strace* rng-tools* manpages* triggerhappy*
apt list --upgradeable 2>/dev/null | cut -d/ -f1 | grep -v Listing >> /tmp/install.list apt list --upgradeable 2>/dev/null | cut -d/ -f1 | grep -v Listing >> /tmp/install.list
echo "ufw rsync" >> /tmp/install.list echo "ufw rsync" >> /tmp/install.list
xargs < /tmp/install.list xargs $PKGI xargs < /tmp/install.list xargs $PKGI
@ -201,12 +224,12 @@ $PKARM
# Installer # # Installer #
##-------------## ##-------------##
TERM=ansi whiptail --title "Pi Automation" --infobox "Installing packages." 8 78
sleep 3
if [[ $OPTIONS == *"Node-RED"* ]]; then if [[ $OPTIONS == *"Node-RED"* ]]; then
bash <(curl -sL https://raw.githubusercontent.com/node-red/linux-installers/master/deb/update-nodejs-and-nodered) --confirm-root --confirm-install --skip-pi --node18 --no-init bash <(curl -sL https://raw.githubusercontent.com/node-red/linux-installers/master/deb/update-nodejs-and-nodered) --confirm-root --confirm-install --skip-pi --node18 --no-init
systemctl enable nodered systemctl enable nodered
###Test if nodered is not yet autostarted###
systemctl status nodered
cd /root/.node-red/ cd /root/.node-red/
npm install @node-red-contrib-themes/midnight-red npm install @node-red-contrib-themes/midnight-red
cd ~ cd ~
@ -233,10 +256,8 @@ fi
if [[ $OPTIONS == *"Domoticz"* ]]; then if [[ $OPTIONS == *"Domoticz"* ]]; then
mkdir -p /etc/domoticz/ mkdir -p /etc/domoticz/
wget $GIT/$REPO/$BRANCH/Domoticz/DomoSetup.conf -O /etc/domoticz/setupVars.conf wget $GIT/$REPO/$BRANCH/Domoticz/DomoSetup.conf -O /etc/domoticz/setupVars.conf
mkdir -p /opt/domoticz/ mkdir -p /opt/domoticz/
bash -c "$(curl -sSfL https://install.domoticz.com)" bash -c "$(curl -sSfL https://install.domoticz.com)"
wget $GIT/$REPO/$BRANCH/Domoticz/DomoService.conf -O /etc/init.d/domoticz.sh wget $GIT/$REPO/$BRANCH/Domoticz/DomoService.conf -O /etc/init.d/domoticz.sh
chmod +x /etc/init.d/domoticz.sh chmod +x /etc/init.d/domoticz.sh
update-rc.d domoticz.sh defaults update-rc.d domoticz.sh defaults
@ -248,6 +269,9 @@ fi
# Configuring # # Configuring #
##---------------## ##---------------##
TERM=ansi whiptail --title "Pi Automation" --infobox "Configuring system." 8 78
sleep 3
echo "" >> /etc/sysctl.conf echo "" >> /etc/sysctl.conf
echo "#Disable IPv6" >> /etc/sysctl.conf echo "#Disable IPv6" >> /etc/sysctl.conf
echo "net.ipv6.conf.all.disable_ipv6 = 1" >> /etc/sysctl.conf echo "net.ipv6.conf.all.disable_ipv6 = 1" >> /etc/sysctl.conf
@ -259,22 +283,34 @@ sed -i 's/IPV6=yes/IPV6=no/g' /etc/default/ufw
ufw default deny incoming ufw default deny incoming
ufw default allow outgoing ufw default allow outgoing
ufw allow 1880/tcp if [[ $OPTIONS == *"Domoticz"* ]]; then
ufw allow 1880/udp ufw allow 8080/tcp
ufw allow 1883/tcp fi
ufw allow 1883/udp if [[ $OPTIONS == *"Zigbee2MQTT"* ]]; then
ufw allow 8080/tcp ufw allow 5002/tcp
ufw limit 22/tcp fi
if [[ $OPTIONS == *"MQTT-Broker"* ]]; then
ufw allow 1883/tcp
ufw allow 1883/udp
fi
if [[ $OPTIONS == *"Node-RED"* ]]; then
ufw allow 1880/tcp
ufw allow 1880/udp
fi
ufw limit 22/tcp
echo "y" | ufw enable echo "y" | ufw enable
sed -i 's/X11Forwarding yes/X11Forwarding no/g' /etc/ssh/sshd_config #sed -i 's/X11Forwarding yes/X11Forwarding no/g' /etc/ssh/sshd_config
##-----------------## ##-----------------##
# Optimizing Pi # # Optimizing Pi #
##-----------------## ##-----------------##
TERM=ansi whiptail --title "Pi Automation" --infobox "Optimizing Raspberry Pi." 8 78
sleep 3
echo "" >> /boot/config.txt echo "" >> /boot/config.txt
echo "#Reduce allocated GPU Memory since we're running headless" >> /boot/config.txt echo "#Reduce allocated GPU Memory since we're running headless" >> /boot/config.txt
echo "gpu_mem=16" >> /boot/config.txt echo "gpu_mem=16" >> /boot/config.txt
@ -321,6 +357,9 @@ sed -i 's/\"//g' /etc/installedmodules
# Finishing # # Finishing #
##-------------## ##-------------##
TERM=ansi whiptail --title "Pi Automation" --infobox " Finishing." 8 78
sleep 3
wget $GIT/$REPO/$BRANCH/Updater.sh -O /opt/updater.sh wget $GIT/$REPO/$BRANCH/Updater.sh -O /opt/updater.sh
wget $GIT/$REPO/$BRANCH/MOTD/greetings.sh -O /etc/profile.d/greeting.sh wget $GIT/$REPO/$BRANCH/MOTD/greetings.sh -O /etc/profile.d/greeting.sh
sed -i -e "s/%name%/$NAME/g" /etc/profile.d/greeting.sh sed -i -e "s/%name%/$NAME/g" /etc/profile.d/greeting.sh
@ -338,11 +377,10 @@ if grep -q Node-RED "/etc/installedmodules"; then
fi fi
if grep -q Zigbee2MQTT "/etc/installedmodules"; then if grep -q Zigbee2MQTT "/etc/installedmodules"; then
echo "Installed on: $DATE" > /opt/backups/timestamps/Zigbee2MQTT.update echo "Installed on: $DATE" > /opt/backups/timestamps/Zigbee2MQTT.update
whiptail --title "Pi Automation!" --msgbox "Please insert the Zigbee Dongle into a USB 2.0 port. Press OK to continue." 8 78
whiptail --title "Remember" --msgbox "After a reboot Zigbee2MQTT is accessible on:\nhttp://$IP:5002" 8 78 whiptail --title "Remember" --msgbox "After a reboot Zigbee2MQTT is accessible on:\nhttp://$IP:5002" 8 78
fi fi
whiptail --title "Done!" --msgbox "Please insert the Zigbee Dongle into a USB 2.0 port. Press OK to continue." 8 78
if grep -q "ssid=" /etc/wpa_supplicant/wpa_supplicant.conf if grep -q "ssid=" /etc/wpa_supplicant/wpa_supplicant.conf
then then
whiptail --title "Done!" --msgbox "The Raspberry Pi will shutdown,\nplease remove the LAN cable before starting up again.\n\nPress OK to continue." 10 78 whiptail --title "Done!" --msgbox "The Raspberry Pi will shutdown,\nplease remove the LAN cable before starting up again.\n\nPress OK to continue." 10 78