Merge pull request #286 from htpcBeginner/develop

Merged Develop

Author: TommyE123

README.md

@@ -38,13 +38,15 @@ Features features of AtoMiC ToolKit include:
 <li>Deluge - Install, Uninstall, Update and Backup / Restore</li>
 <li>Emby - Install, Uninstall, Update and Backup / Restore</li>
 <li>FileBot - Install, Uninstall, Update</li>
+<li>Flood - Install, Uninstall, Update</li>
 <li>Glances - Install, Uninstall, Update</li>
 <li>Grafana - Install, Uninstall, Update and Backup / Restore</li>
 <li>Headphones - Install, Uninstall, Reset Password, Update and Backup / Restore</li>
 <li>HTPC Manager - Install, Uninstall, Update and Backup / Restore</li>
 <li>Jackett - Install, Uninstall, Update and Backup / Restore</li>
 <li>Kodi - Install, Uninstall Autoboot enable and Update</li>
 <li>Lazy Librarian - Install, Uninstall, Reset Password, Update and Backup / Restore</li>
+<li>Lidarr - Install, Uninstall, Update and Backup / Restore</li>
 <li>Madsonic - Install, Uninstall, Update and Backup / Restore</li>
 <li>Medusa - Install, Uninstall, Update and Backup / Restore</li>
 <li>Muximux - Install, Uninstall, Update</li>
@@ -78,7 +80,7 @@ Features features of AtoMiC ToolKit include:
 <li>Webmin - Install, Uninstall, Update and Backup / Restore</li>
 </ul></li>
 <li>Reset forgotten WebUI passwords</li>
-<li>Makes moving apps between different computers easier</li>
+<li>Makes moving apps between different computers easier (see dedicated section below)</li>
 <li>Correctly sets required permissions for trouble free operation</li>
 <li>And best of all its FREE! Please consider donating if toolkit helps you.</li>
 </ul>
@@ -144,4 +146,7 @@ $ sudo bash --manualupdate sonarr
 <h2>Default Usernames and Passwords</h2>
 Access details have now been simplified and automated. Access details for each app can be obtained through the ToolKit Menus. It is recommended that you set / update usernames and password for all services. 
 
+<h2>Backup/restore process</h2>
+The default location for stored backups is /opt/AtoMiC-ToolKit/backups. If you are transferring to a new machine, you should keep this folder so all the zips are available to restore later. You just need to copy it back, install the application again and restore the backup.
+
 For more information on installation and usage, visit <a href="http://www.htpcbeginner.com/atomic-toolkit/">AtoMiC ToolKit</a> page on on htpcBeginner.com.

batch-processes/bat-apps-install-uninstall.sh

@@ -18,15 +18,17 @@ source "$SCRIPTPATH/setup.sh" -i deluged
 source "$SCRIPTPATH/setup.sh" -u deluged
 source "$SCRIPTPATH/setup.sh" -i filebot
 source "$SCRIPTPATH/setup.sh" -u filebot
+source "$SCRIPTPATH/setup.sh" -i grafana
+# source "$SCRIPTPATH/setup.sh" -x grafana
+source "$SCRIPTPATH/setup.sh" -u grafana
+source "$SCRIPTPATH/setup.sh" -i flood # Installs Node which runs on port 3000
+source "$SCRIPTPATH/setup.sh" -u flood
 source "$SCRIPTPATH/setup.sh" -i emby-server
 # source "$SCRIPTPATH/setup.sh" -x emby-server
 source "$SCRIPTPATH/setup.sh" -u emby-server
 source "$SCRIPTPATH/setup.sh" -i glances
 # source "$SCRIPTPATH/setup.sh" -x glances
 source "$SCRIPTPATH/setup.sh" -u glances
-source "$SCRIPTPATH/setup.sh" -i grafana
-# source "$SCRIPTPATH/setup.sh" -x grafana
-source "$SCRIPTPATH/setup.sh" -u grafana
 source "$SCRIPTPATH/setup.sh" -i headphones
 # source "$SCRIPTPATH/setup.sh" -x headphones
 source "$SCRIPTPATH/setup.sh" -u headphones
@@ -38,9 +40,12 @@ source "$SCRIPTPATH/setup.sh" -u headphones
 # source "$SCRIPTPATH/setup.sh" -u jackett
 # source "$SCRIPTPATH/setup.sh" -i kodi
 # source "$SCRIPTPATH/setup.sh" -u kodi
-source "$SCRIPTPATH/setup.sh" -i lazylibrarian
+# source "$SCRIPTPATH/setup.sh" -i lazylibrarian # Init.d script broken
 # source "$SCRIPTPATH/setup.sh" -x lazylibrarian
-source "$SCRIPTPATH/setup.sh" -u lazylibrarian
+# source "$SCRIPTPATH/setup.sh" -u lazylibrarian
+source "$SCRIPTPATH/setup.sh" -i lidarr
+# source "$SCRIPTPATH/setup.sh" -x lidarr
+source "$SCRIPTPATH/setup.sh" -u lidarr
 source "$SCRIPTPATH/setup.sh" -i madsonic
 # source "$SCRIPTPATH/setup.sh" -x madsonic
 source "$SCRIPTPATH/setup.sh" -u madsonic
@@ -81,7 +86,7 @@ source "$SCRIPTPATH/setup.sh" -u rclone-browser
 source "$SCRIPTPATH/setup.sh" -i resilio-sync
 # source "$SCRIPTPATH/setup.sh" -x resilio-sync
 source "$SCRIPTPATH/setup.sh" -u resilio-sync
-source "$SCRIPTPATH/setup.sh" -i rtorrent
+# source "$SCRIPTPATH/setup.sh" -i rtorrent
 source "$SCRIPTPATH/setup.sh" -u rtorrent
 source "$SCRIPTPATH/setup.sh" -i sabnzbdplus
 # source "$SCRIPTPATH/setup.sh" -x sabnzbdplus

batch-processes/bat-apps-install.sh

@@ -5,13 +5,15 @@ source "$SCRIPTPATH/setup.sh" -i couchpotato
 # source "$SCRIPTPATH/setup.sh" -i deluged
 source "$SCRIPTPATH/setup.sh" -i emby-server
 source "$SCRIPTPATH/setup.sh" -i filebot
+source "$SCRIPTPATH/setup.sh" -i flood
 source "$SCRIPTPATH/setup.sh" -i glances
 source "$SCRIPTPATH/setup.sh" -i grafana
 source "$SCRIPTPATH/setup.sh" -i headphones
 source "$SCRIPTPATH/setup.sh" -i htpcmanager
 source "$SCRIPTPATH/setup.sh" -i jackett
 source "$SCRIPTPATH/setup.sh" -i kodi
 source "$SCRIPTPATH/setup.sh" -i lazylibrarian
+source "$SCRIPTPATH/setup.sh" -i lidarr
 source "$SCRIPTPATH/setup.sh" -i madsonic
 source "$SCRIPTPATH/setup.sh" -i medusa
 source "$SCRIPTPATH/setup.sh" -i muximux
@@ -29,7 +31,6 @@ source "$SCRIPTPATH/setup.sh" -i radarr
 source "$SCRIPTPATH/setup.sh" -i rclone
 source "$SCRIPTPATH/setup.sh" -i rclone-browser
 source "$SCRIPTPATH/setup.sh" -i resilio-sync
-source "$SCRIPTPATH/setup.sh" -i rtorrent
 source "$SCRIPTPATH/setup.sh" -i rutorrent
 source "$SCRIPTPATH/setup.sh" -i sabnzbdplus
 # source "$SCRIPTPATH/setup.sh" -i sickgear

batch-processes/bat-apps-uninstall.sh

@@ -5,13 +5,15 @@ source "$SCRIPTPATH/setup.sh" -u couchpotato
 source "$SCRIPTPATH/setup.sh" -u deluged
 source "$SCRIPTPATH/setup.sh" -u emby-server
 source "$SCRIPTPATH/setup.sh" -u filebot
+source "$SCRIPTPATH/setup.sh" -u flood
 source "$SCRIPTPATH/setup.sh" -u glances
 source "$SCRIPTPATH/setup.sh" -u grafana
 source "$SCRIPTPATH/setup.sh" -u headphones
 source "$SCRIPTPATH/setup.sh" -u htpcmanager
 source "$SCRIPTPATH/setup.sh" -u jackett
 source "$SCRIPTPATH/setup.sh" -u kodi
 source "$SCRIPTPATH/setup.sh" -u lazylibrarian
+source "$SCRIPTPATH/setup.sh" -u lidarr
 source "$SCRIPTPATH/setup.sh" -u madsonic
 source "$SCRIPTPATH/setup.sh" -u medusa
 source "$SCRIPTPATH/setup.sh" -u muximux

batch-processes/bat-apps-update.sh

@@ -5,13 +5,15 @@ source "$SCRIPTPATH/setup.sh" -m couchpotato
 source "$SCRIPTPATH/setup.sh" -m deluged
 source "$SCRIPTPATH/setup.sh" -m emby-server
 source "$SCRIPTPATH/setup.sh" -m filebot
+source "$SCRIPTPATH/setup.sh" -m flood
 source "$SCRIPTPATH/setup.sh" -m glances
 source "$SCRIPTPATH/setup.sh" -m grafana
 source "$SCRIPTPATH/setup.sh" -m headphones
 source "$SCRIPTPATH/setup.sh" -m htpcmanager
 source "$SCRIPTPATH/setup.sh" -m jackett
 source "$SCRIPTPATH/setup.sh" -m kodi
 source "$SCRIPTPATH/setup.sh" -m lazylibrarian
+source "$SCRIPTPATH/setup.sh" -m lidarr
 source "$SCRIPTPATH/setup.sh" -m madsonic
 source "$SCRIPTPATH/setup.sh" -m medusa
 source "$SCRIPTPATH/setup.sh" -m muximux
@@ -29,7 +31,6 @@ source "$SCRIPTPATH/setup.sh" -m radarr
 source "$SCRIPTPATH/setup.sh" -m rclone
 source "$SCRIPTPATH/setup.sh" -m rclone-browser
 source "$SCRIPTPATH/setup.sh" -m resilio-sync
-source "$SCRIPTPATH/setup.sh" -m rtorrent
 source "$SCRIPTPATH/setup.sh" -m rutorrent
 source "$SCRIPTPATH/setup.sh" -m sabnzbdplus
 source "$SCRIPTPATH/setup.sh" -m sickgear

flood/flood-constants.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+APPNAME='flood'
+APPTITLE='Flood'
+APPSHORTNAME='fl'
+APPPATH='/opt/flood'
+APPGIT='https://github.com/jfurrow/flood.git'
+APPSETTINGS="$APPPATH/config.js"
+NPMDEPS='node-gyp argon2'
+APPDPORT='3000'
+ACCESSHOST='NA'
+PORTSEARCH='floodServerPort: '
+APPSYSTEMD='flood.service'
+APPSYSTEMDLOC="$SCRIPTPATH/flood/$APPSYSTEMD"
+APPINITD='flood'
+APPINITDLOC="$SCRIPTPATH/flood/flood.init"

flood/flood-init-update.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Script Name: AtoMiC Flood init.d update
+
+echo 'Updating init.d file'
+
+ReplaceString "user=\"ReplaceMe\"" "user=\"$UNAME\"" /etc/init.d/$APPINITD
+ReplaceString "group=\"ReplaceMe\"" "group=\"$UGROUP\"" /etc/init.d/$APPINITD

flood/flood-installer.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Script Name: AtoMiC Flood Installer
+
+source "$SCRIPTPATH/inc/commons.sh"
+source "$SCRIPTPATH/inc/header.sh"
+echo -e "${GREEN}AtoMiC $APPTITLE Installer Script$ENDCOLOR"
+source "$SCRIPTPATH/inc/pause.sh"
+source "$SCRIPTPATH/rtorrent/rtorrent-installer.sh"
+source "$SCRIPTPATH/utils/nodejs/nodejs-installer.sh"
+source "$SCRIPTPATH/utils/python/python-installer.sh"
+source "$SCRIPTPATH/flood/flood-constants.sh"
+source "$SCRIPTPATH/inc/app-autostart-remove.sh"
+source "$SCRIPTPATH/inc/app-move-previous.sh"
+source "$SCRIPTPATH/inc/app-git-download.sh"
+source "$SCRIPTPATH/inc/app-install-npm-deps.sh"
+source "$SCRIPTPATH/flood/flood-settings-configurator.sh"
+source "$SCRIPTPATH/inc/app-install-build-npm.sh"
+source "$SCRIPTPATH/inc/app-autostart-configure.sh"
+source "$SCRIPTPATH/inc/app-start.sh"
+source "$SCRIPTPATH/inc/app-install-confirmation.sh"
+source "$SCRIPTPATH/inc/thankyou.sh"
+source "$SCRIPTPATH/inc/exit.sh"

flood/flood-menu.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+# Script Name: AtoMiC Flood Menu
+
+SUBCHOICE=$(whiptail --title "AtoMiC Toolkit - Manage Flood" \
+--menu "What would you like to do?" --backtitle "$BACKTITLE" \
+--fb --cancel-button "Exit" $LINES $COLUMNS "$NETLINES" \
+"Install" "Install Flood" \
+"Uninstall" "Uninstall Flood" \
+"Manual Update" "Manually update Flood" \
+"Enable Reverse Proxy" "Allow access" \
+"Disable Reverse Proxy" "Remove access" \
+"Access Details" "View Flood access details" \
+"Go Back" "Back to Main Menu" 3>&1 1>&2 2>&3)
+
+exitstatus=$?
+if [[ $exitstatus = 0 ]]; then
+    source "$SCRIPTPATH/flood/flood-constants.sh"
+    case "$SUBCHOICE" in
+        "Install" ) source "$SCRIPTPATH/$APPNAME/$APPNAME-installer.sh" ;;
+        "Uninstall" ) source "$SCRIPTPATH/$APPNAME/$APPNAME-uninstaller.sh" ;;
+        "Manual Update" ) source "$SCRIPTPATH/$APPNAME/$APPNAME-update.sh" ;;
+        "Enable Reverse Proxy" ) source "$SCRIPTPATH/utils/nginx/nginx-enable-location.sh" ;;
+        "Disable Reverse Proxy" ) source "$SCRIPTPATH/utils/nginx/nginx-disable-location.sh" ;;
+        "Access Details" ) source "$SCRIPTPATH/inc/app-access-details.sh" ;;
+        "Go Back" ) source "$SCRIPTPATH/menus/menu-bittorrent.sh" ;;
+        *) source "$SCRIPTPATH/inc/invalid-option.sh" ;;
+    esac
+else
+    source "$SCRIPTPATH/inc/thankyou.sh"
+    echo
+    sleep 1
+    exit 0
+fi

flood/flood-reverse-proxy-disable.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Script Name: AtoMiC SickRage Reverse Proxy Disable.
+
+if grep -q "baseURI: '/flood'," "$APPSETTINGS"; then
+    ReplaceString "baseURI: '/flood'," "baseURI: '/'," "$APPSETTINGS"
+    source "$SCRIPTPATH/inc/app-install-build-npm.sh"
+fi

flood/flood-reverse-proxy-enable.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Script Name: AtoMiC SickRage Reverse Proxy Enable.
+
+if ! grep -q "baseURI: '/flood'," "$APPSETTINGS"; then
+    ReplaceString "baseURI: '/'," "baseURI: '/flood'," "$APPSETTINGS"
+    source "$SCRIPTPATH/inc/app-install-build-npm.sh"
+fi

flood/flood-settings-configurator.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# Script Name: AtoMiC Flood settings configurator
+
+echo
+echo -e "$YELLOW--->Configuring Flood Settings...$ENDCOLOR"
+
+#Copy config.template.js to config.js
+if cp "$APPPATH/config.template.js" "$APPPATH/config.js" || \
+        { echo -e "${RED}Could not create config.js.$ENDCOLOR"; exit 1; }; then
+    echo "Config.js file created"
+fi
+
+chown "$UNAME":"$UGROUP" "$APPSETTINGS"
+
+ReplaceString "floodServerHost: '127.0.0.1'," "floodServerHost: '0.0.0.0'," "$APPSETTINGS"

flood/flood-systemd-update.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Script Name: AtoMiC Flood systemd update
+
+ReplaceString "ReplaceMe" "$UNAME" "/etc/systemd/system/$APPSYSTEMD"
+
+sudo systemctl daemon-reload
+sudo systemctl enable "$APPSYSTEMD"

flood/flood-uninstaller.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# Script Name: AtoMiC Flood Uninstaller
+
+source "$SCRIPTPATH/inc/commons.sh"
+source "$SCRIPTPATH/inc/header.sh"
+echo -e "${GREEN}AtoMiC $APPTITLE Uninstaller Script$ENDCOLOR"
+source "$SCRIPTPATH/inc/pause.sh"
+source "$SCRIPTPATH/inc/app-autostart-remove.sh"
+source "$SCRIPTPATH/inc/app-file-del.sh"
+source "$SCRIPTPATH/inc/app-uninstall-confirmation.sh"
+source "$SCRIPTPATH/inc/thankyou.sh"
+source "$SCRIPTPATH/inc/exit.sh"

flood/flood-update.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Script Name: AtoMiC Flood Updater
+
+source "$SCRIPTPATH/inc/header.sh"
+echo -e "${GREEN}AtoMiC $APPTITLE Update Script$ENDCOLOR"
+source "$SCRIPTPATH/inc/pause.sh"
+
+if DoesAppFolderExist; then
+    source "$SCRIPTPATH/utils/nginx/nginx-update.sh"
+    source "$SCRIPTPATH/rtorrent/rtorrent-update.sh"
+    source "$SCRIPTPATH/utils/nodejs/nodejs-update.sh"
+    source "$SCRIPTPATH/rutorrent/rutorrent-constants.sh"
+
+    if ! git diff-index --quiet HEAD --; then
+        source "$SCRIPTPATH/inc/app-git-update.sh"
+        source "$SCRIPTPATH/inc/app-install-build-npm.sh"
+    fi
+
+    source "$SCRIPTPATH/inc/app-update-confirmation.sh"
+    source "$SCRIPTPATH/inc/thankyou.sh"
+fi
+source "$SCRIPTPATH/inc/exit.sh"