Merge pull request #135 from TechPerplexed/Renaming

Renaming

Author: TechPerplexed

README.md

@@ -11,9 +11,9 @@ Run on Ubuntu or Debian with this command:
 
 ## Supported Apps:
 
-One click installation of **Rclone**, **Plex**, **Tautulli**, **Emby**, **Sonarr**, **Radarr**, **Deluge**, **NZBGet**, **Jackett**, **Netdata**, **Organizr**, **Ombi** and **Portainer**.
+One click installation of **Rclone**, **Plex**, **Tautulli**, **Emby**, **Jellyfin**, **Sonarr**, **Radarr**, **Deluge**, **NZBGet**, **Jackett**, **Netdata**, **Organizr**, **Ombi**, **Portainer** and **Apache web server**.
 
-**Lidarr**, **Jellyfin**, **RuTorrent**, **SABnzbd**, **Radarr4k**, **Monitorr**, **PostgreSQL**, **Apache web server** and **Watchtower** are available through self installation.
+**Lidarr**, **RuTorrent**, **SABnzbd**, **Radarr4k**, **Monitorr**, **NextCloud**, **MySQL**, **MariaDB**, **PostgreSQL** and numerous other Docker images are available through self installation.
 
 ## Disclaimer:
 

install/server/server-init.sh

@@ -35,7 +35,7 @@ if [ ! -e ${CONFIGVARS}/proxyversion ]; then
   PROXYVERSION=$(cat ${CONFIGVARS}/proxyversion)
 fi
 
-sudo rsync -a /opt/Gooby/scripts/${PROXYVERSION}/{00-version.yaml,01-proxy.yaml,99-network.yaml} ${CONFIGS}/Docker/components
+sudo rsync -a /opt/Gooby/scripts/${PROXYVERSION}/{01-header.yaml,02-oauth.yaml,03-proxy.yaml,04-watchtower.yaml,05-autoheal.yaml,99-footer.yaml} ${CONFIGS}/Docker/components
 touch ${CONFIGVARS}/cf_email ${CONFIGVARS}/cf_key ${CONFIGVARS}/plexclaim ${CONFIGVARS}/rclonefolder ${CONFIGVARS}/rcloneservice ${CONFIGVARS}/rcloneversion ${CONFIGVARS}/version
 
 source /opt/Gooby/install/misc/environment-build.sh

menus/appsdownload.sh

@@ -5,6 +5,15 @@ source /opt/Gooby/menus/variables.sh
 
 # Menu Options
 
+RADARR(){
+	TASK=Radarr
+	APP=radarr
+	APPTYPE=app
+	APPLOC=51-radarr
+	OLDLOC=${USER}/.config/Radarr/
+	source /opt/Gooby/menus/apps.sh
+}
+
 SONARR(){
 	TASK=Sonarr
 	APP=sonarr
@@ -14,20 +23,11 @@ SONARR(){
 	source /opt/Gooby/menus/apps.sh
 }
 
-RADARR(){
-	TASK=Radarr
-	APP=radarr
-	APPTYPE=app
-	APPLOC=50-radarr
-	OLDLOC=${USER}/.config/Radarr/
-	source /opt/Gooby/menus/apps.sh
-}
-
 DELUGE(){
 	TASK=Deluge
 	APP=deluge
 	APPTYPE=app
-	APPLOC=40-deluge
+	APPLOC=41-deluge
 	OLDLOC=${USER}/.config/deluge/
 	source /opt/Gooby/menus/apps.sh
 }
@@ -36,7 +36,7 @@ NZBGET(){
 	TASK=NZBGet
 	APP=nzbget
 	APPTYPE=app
-	APPLOC=30-nzbget
+	APPLOC=31-nzbget
 	OLDLOC=/noupgradepathprovided
 	source /opt/Gooby/menus/apps.sh
 }
@@ -45,7 +45,7 @@ JACKETT(){
 	TASK=Jackett
 	APP=jackett
 	APPTYPE=app
-	APPLOC=44-jackett
+	APPLOC=56-jackett
 	OLDLOC=/noupgradepathprovided
 	source /opt/Gooby/menus/apps.sh
 }
@@ -60,8 +60,8 @@ COLOUR=${LPURPLE}
 
 show_menus() {
 	MENUSTART
-	echo " ${COLOUR}A${STD} - Sonarr"
-	echo " ${COLOUR}B${STD} - Radarr"
+	echo " ${COLOUR}A${STD} - Radarr"
+	echo " ${COLOUR}B${STD} - Sonarr"
 	echo " ${COLOUR}C${STD} - Deluge"
 	echo " ${COLOUR}D${STD} - NZBGet"
 	echo " ${COLOUR}E${STD} - Jackett"
@@ -76,8 +76,8 @@ read_options(){
 	local CHOICE
 	read -n 1 -s -r -p "Choose option: " CHOICE
 	case ${CHOICE} in
-		[Aa]) SONARR ;;
-		[Bb]) RADARR ;;
+		[Aa]) RADARR ;;
+		[Bb]) SONARR ;;
 		[Cc]) DELUGE ;;
 		[Dd]) NZBGET ;;
 		[Ee]) JACKETT ;;

menus/appsmedia.sh

@@ -16,7 +16,7 @@ PLEX(){
 	TASK=Plex
 	APP=plex
 	APPTYPE=app
-	APPLOC=20-plex
+	APPLOC=21-plex
 	OLDLOC=/var/lib/plexmediaserver/
 	source /opt/Gooby/menus/apps.sh
 }
@@ -39,6 +39,15 @@ EMBY(){
 	source /opt/Gooby/menus/apps.sh
 }
 
+JELLYFIN(){
+	TASK=Jellyfin
+	APP=jellyfin
+	APPTYPE=app
+	APPLOC=23-jellyfin
+	OLDLOC=/var/lib/jellyfin/
+	source /opt/Gooby/menus/apps.sh
+}
+
 QUIT(){
 	exit
 }
@@ -53,6 +62,7 @@ show_menus() {
 	echo " ${COLOUR}B${STD} - Plex"
 	echo " ${COLOUR}C${STD} - Tautulli"
 	echo " ${COLOUR}D${STD} - Emby"
+	echo " ${COLOUR}E${STD} - Jellyfin"
 	echo " ${WHITE}Z${STD} - EXIT to Main Menu"
 	echo " ${COLOUR}"
 	MENUEND
@@ -67,7 +77,8 @@ read_options(){
 		[Aa]) RCLONE ;;
 		[Bb]) PLEX ;;
 		[Cc]) TAUTULLI ;;
-		[Dd]) EMBY ;;      
+		[Dd]) EMBY ;;
+		[Ee]) JELLYFIN ;;
 		[Zz]) QUIT ;;
 		*) echo "${LRED}Please select a valid option${STD}" && sleep 1
 	esac

menus/appsother.sh

@@ -9,7 +9,7 @@ NETDATA(){
 	TASK=Netdata
 	APP=netdata
 	APPTYPE=app
-	APPLOC=02-netdata
+	APPLOC=62-netdata
 	OLDLOC=/noupgradepathprovided
 	source /opt/Gooby/menus/apps.sh
 }
@@ -18,7 +18,7 @@ ORGANIZR(){
 	TASK=Organizr
 	APP=organizr
 	APPTYPE=app
-	APPLOC=03-organizr
+	APPLOC=11-organizr
 	OLDLOC=/noupgradepathprovided
 	source /opt/Gooby/menus/apps.sh
 }
@@ -27,7 +27,7 @@ OMBI(){
 	TASK=Ombi
 	APP=ombi
 	APPTYPE=app
-	APPLOC=60-ombi
+	APPLOC=12-ombi
 	OLDLOC=/opt/Ombi/
 	source /opt/Gooby/menus/apps.sh
 }
@@ -36,16 +36,16 @@ PORTAINER(){
 	TASK=Portainer
 	APP=portainer
 	APPTYPE=app
-	APPLOC=10-portainer
+	APPLOC=64-portainer
 	OLDLOC=/noupgradepathprovided
 	source /opt/Gooby/menus/apps.sh
 }
 
-WATCHTOWER(){
-	TASK=Watchtower
-	APP=watchtower
+APACHE(){
+	TASK=Apache
+	APP=apache
 	APPTYPE=app
-	APPLOC=04-watchtower
+	APPLOC=81-phpapache
 	OLDLOC=/noupgradepathprovided
 	source /opt/Gooby/menus/apps.sh
 }
@@ -64,7 +64,7 @@ show_menus() {
 	echo " ${COLOUR}B${STD} - Organizr"
 	echo " ${COLOUR}C${STD} - Ombi"
 	echo " ${COLOUR}D${STD} - Portainer"
-	echo " ${COLOUR}E${STD} - Watchtower"
+	echo " ${COLOUR}E${STD} - PHP Apache"
 	echo " ${WHITE}Z${STD} - EXIT to Main Menu"
 	echo " ${COLOUR}"
 	MENUEND
@@ -80,7 +80,7 @@ read_options(){
 		[Bb]) ORGANIZR ;;
 		[Cc]) OMBI ;;
 		[Dd]) PORTAINER ;;
-		[Ee]) WATCHTOWER ;;
+		[Ee]) APACHE ;;
 		[Zz]) QUIT ;;
 		*) echo "${LRED}Please select a valid option${STD}" && sleep 1
 	esac

scripts/cron/upgradeservice.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.2.1
+VERSION=2.2.2
 
 CONFIGVARS=${CONFIGS}/Docker/.config
 sudo mkdir -p ${CONFIGVARS}
@@ -15,90 +15,42 @@ else
 
 	echo "${LYELLOW}Upgrading to v${VERSION}... just a moment${STD}"; echo; sleep 2
 
-	# Check if necessary apps are installed
-
-	if [ ! -e ${CONFIGVARS}/proxyversion ]; then
-		sudo apt-get update
-		APPLIST="acl apt-transport-https ca-certificates curl fuse git gpg-agent grsync jq mergerfs nano pigz rsyncufw socat sqlite3 ufw unzip wget"
-		for i in ${APPLIST}; do
-			echo Checking $i...
-			sudo apt-get -y install $i
-			echo
-		done
-	fi
-
-	# Move and rename folders
-
-	if [ -d ${CONFIGS}/Security ]; then
-		sudo mv ${CONFIGS}/Certs ${CONFIGS}/Docker
-		sudo mv ${CONFIGS}/Docker/Certs ${CONFIGS}/Docker/certs
-		sudo mv ${CONFIGS}/nginx ${CONFIGS}/Docker
-		sudo mv ${CONFIGS}/Security ${CONFIGS}/Docker
-		sudo mv ${CONFIGS}/Docker/Security ${CONFIGS}/Docker/security
-	fi
-
-	if [ -d /var/local/.Gooby ]; then
-		sudo mv /var/local/.Gooby/* ${CONFIGVARS}
-		sudo rm -r /var/local/.Gooby
-	fi
-
-	if [ -d /var/local/Gooby/.config ]; then
-		sudo mv ${CONFIGS}/.config/* ${CONFIGVARS}
-		sudo mv ${CONFIGVARS}/rclonev ${CONFIGVARS}/rcloneversion
-		sudo mv ${CONFIGVARS}/upgrade ${CONFIGVARS}/version
-		sudo rm -r /var/local/Gooby/.config
-	fi
-
-	# Upgrade Rclone service 
-
-	cat /etc/systemd/system/rclonefs.service | grep "pass" > /dev/null
-	if ! [[ ${?} -eq 0 ]]; then
-		sudo mv /etc/systemd/system/rclone* /tmp
-		sudo rsync -a /opt/Gooby/scripts/services/rclonefs* /etc/systemd/system/
-		sudo sed -i "s/GOOBYUSER/${USER}/g" /etc/systemd/system/rclonefs.service
-		sudo systemctl daemon-reload
-	fi
-
-	cat ${HOME}/.config/rclone/rclone.conf | grep "Local" > /dev/null
-	if ! [[ ${?} -eq 0 ]]; then
-		echo [Local] >> ${HOME}/.config/rclone/rclone.conf
-		echo type = local >> ${HOME}/.config/rclone/rclone.conf
-		echo nounc = >> ${HOME}/.config/rclone/rclone.conf
-	fi
-
-	# Add resetbackup cron
-
-	if crontab -l | grep 'backup.sh'; then
-		crontab -l | grep 'resetbackup' || (crontab -l 2>/dev/null; echo "10 2 1 * * /bin/resetbackup > /dev/null 2>&1") | crontab -
-	fi
-
-	# Add Gooby branch
-
-	if [ ! -s ${CONFIGVARS}/goobybranch ]; then
-		echo "master" > ${CONFIGVARS}/goobybranch
-	fi
-
-	# Add proxy version
-
-	if [ ! -s ${CONFIGVARS}/proxyversion ]; then
-		echo "nginx" > ${CONFIGVARS}/proxyversion
-		touch ${CONFIGVARS}/cf_email ${CONFIGVARS}/cf_key
-	fi
-
-	if [ ! -d ${CONFIGS}/Docker/traefik ]; then
-		sudo mkdir -p ${CONFIGS}/Docker/traefik
-		sudo rsync -a /opt/Gooby/scripts/services/traefik.toml ${CONFIGS}/Docker/traefik/
-		sudo sed -i "s/GOOBYDOMAIN/${MYDOMAIN}/g" ${CONFIGS}/Docker/traefik/traefik.toml
-		sudo sed -i "s/GOOBYEMAIL/${MYEMAIL}/g" ${CONFIGS}/Docker/traefik/traefik.toml
-	fi
-
-	# Update Proxy
-
-	if [ -f ${CONFIGS}/Docker/components/00-AAA.yaml ]; then
-		PROXYVERSION=$(cat ${CONFIGVARS}/proxyversion)
-		sudo rsync -a /opt/Gooby/scripts/${PROXYVERSION}/{00-version.yaml,01-proxy.yaml,99-network.yaml} ${CONFIGS}/Docker/components
-		sudo rm ${CONFIGS}/Docker/components/00-AAA.yaml
-	fi
+	# Update and rename apps
+
+	[[ -f ${CONFIGS}/Docker/components/00-version.yaml ]] && sudo mv ${CONFIGS}/Docker/components/00-version.yaml ${CONFIGS}/Docker/components/01-header.yaml
+	[[ -f ${CONFIGS}/Docker/components/01-proxy.yaml ]] && sudo mv ${CONFIGS}/Docker/components/01-proxy.yaml ${CONFIGS}/Docker/components/03-proxy.yaml
+	[[ -f ${CONFIGS}/Docker/components/02-netdata.yaml ]] && sudo mv ${CONFIGS}/Docker/components/02-netdata.yaml ${CONFIGS}/Docker/components/62-netdata.yaml
+	[[ -f ${CONFIGS}/Docker/components/03-organizr-beta.yaml ]] && sudo mv ${CONFIGS}/Docker/components/03-organizr-beta.yaml ${CONFIGS}/Docker/components/11-organizr-beta.yaml
+	[[ -f ${CONFIGS}/Docker/components/03-organizr.yaml ]] && sudo mv ${CONFIGS}/Docker/components/03-organizr.yaml ${CONFIGS}/Docker/components/11-organizr.yaml
+	[[ -f ${CONFIGS}/Docker/components/98-watchtower.yaml ]] && sudo mv ${CONFIGS}/Docker/components/98-watchtower.yaml ${CONFIGS}/Docker/components/04-watchtower.yaml
+	[[ -f ${CONFIGS}/Docker/components/10-portainer.yaml ]] && sudo mv ${CONFIGS}/Docker/components/10-portainer.yaml ${CONFIGS}/Docker/components/64-portainer.yaml
+	[[ -f ${CONFIGS}/Docker/components/20-plex-beta.yaml ]] && sudo mv ${CONFIGS}/Docker/components/20-plex-beta.yaml ${CONFIGS}/Docker/components/21-plex-beta.yaml
+	[[ -f ${CONFIGS}/Docker/components/20-plex-hw.yaml ]] && sudo mv ${CONFIGS}/Docker/components/20-plex-hw.yaml ${CONFIGS}/Docker/components/21-plex-hw.yaml
+	[[ -f ${CONFIGS}/Docker/components/20-plex.yaml ]] && sudo mv ${CONFIGS}/Docker/components/20-plex.yaml ${CONFIGS}/Docker/components/21-plex.yaml
+	[[ -f ${CONFIGS}/Docker/components/22-emby-beta.yaml ]] && sudo mv ${CONFIGS}/Docker/components/22-emby-beta.yaml ${CONFIGS}/Docker/components/22-emby-beta.yaml
+	[[ -f ${CONFIGS}/Docker/components/22-emby-hw.yaml ]] && sudo mv ${CONFIGS}/Docker/components/22-emby-hw.yaml ${CONFIGS}/Docker/components/22-emby-hw.yaml
+	[[ -f ${CONFIGS}/Docker/components/22-emby.yaml ]] && sudo mv ${CONFIGS}/Docker/components/22-emby.yaml ${CONFIGS}/Docker/components/22-emby.yaml
+	[[ -f ${CONFIGS}/Docker/components/24-jellyfin.yaml ]] && sudo mv ${CONFIGS}/Docker/components/24-jellyfin.yaml ${CONFIGS}/Docker/components/23-jellyfin.yaml
+	[[ -f ${CONFIGS}/Docker/components/25-tautulli.yaml ]] && sudo mv ${CONFIGS}/Docker/components/25-tautulli.yaml ${CONFIGS}/Docker/components/25-tautulli.yaml
+	[[ -f ${CONFIGS}/Docker/components/26-embystat.yaml ]] && sudo mv ${CONFIGS}/Docker/components/26-embystat.yaml ${CONFIGS}/Docker/components/26-embystat.yaml
+	[[ -f ${CONFIGS}/Docker/components/30-nzbget.yaml ]] && sudo mv ${CONFIGS}/Docker/components/30-nzbget.yaml ${CONFIGS}/Docker/components/31-nzbget.yaml
+	[[ -f ${CONFIGS}/Docker/components/33-sabnzbd.yaml ]] && sudo mv ${CONFIGS}/Docker/components/33-sabnzbd.yaml ${CONFIGS}/Docker/components/32-sabnzbd.yaml
+	[[ -f ${CONFIGS}/Docker/components/40-deluge.yaml ]] && sudo mv ${CONFIGS}/Docker/components/40-deluge.yaml ${CONFIGS}/Docker/components/41-deluge.yaml
+	[[ -f ${CONFIGS}/Docker/components/41-rtorrent.yaml ]] && sudo mv ${CONFIGS}/Docker/components/41-rtorrent.yaml ${CONFIGS}/Docker/components/45-rtorrent.yaml
+	[[ -f ${CONFIGS}/Docker/components/44-jackett.yaml ]] && sudo mv ${CONFIGS}/Docker/components/44-jackett.yaml ${CONFIGS}/Docker/components/56-jackett.yaml
+	[[ -f ${CONFIGS}/Docker/components/50-radarr-beta.yaml ]] && sudo mv ${CONFIGS}/Docker/components/50-radarr-beta.yaml ${CONFIGS}/Docker/components/51-radarr-beta.yaml
+	[[ -f ${CONFIGS}/Docker/components/50-radarr.yaml ]] && sudo mv ${CONFIGS}/Docker/components/50-radarr.yaml ${CONFIGS}/Docker/components/51-radarr.yaml
+	[[ -f ${CONFIGS}/Docker/components/51-radarr4k-beta.yaml ]] && sudo mv ${CONFIGS}/Docker/components/51-radarr4k-beta.yaml ${CONFIGS}/Docker/components/59-radarr4k-beta.yaml
+	[[ -f ${CONFIGS}/Docker/components/51-radarr4k.yaml ]] && sudo mv ${CONFIGS}/Docker/components/51-radarr4k.yaml ${CONFIGS}/Docker/components/59-radarr4k.yaml
+	[[ -f ${CONFIGS}/Docker/components/52-sonarr.yaml ]] && sudo mv ${CONFIGS}/Docker/components/52-sonarr.yaml ${CONFIGS}/Docker/components/52-sonarr.yaml
+	[[ -f ${CONFIGS}/Docker/components/54-lidarr.yaml ]] && sudo mv ${CONFIGS}/Docker/components/54-lidarr.yaml ${CONFIGS}/Docker/components/53-lidarr.yaml
+	[[ -f ${CONFIGS}/Docker/components/60-ombi.yaml ]] && sudo mv ${CONFIGS}/Docker/components/60-ombi.yaml ${CONFIGS}/Docker/components/12-ombi.yaml
+	[[ -f ${CONFIGS}/Docker/components/65-monitorr.yaml ]] && sudo mv ${CONFIGS}/Docker/components/65-monitorr.yaml ${CONFIGS}/Docker/components/13-monitorr.yaml
+	[[ -f ${CONFIGS}/Docker/components/80-php.yaml ]] && sudo mv ${CONFIGS}/Docker/components/80-php.yaml ${CONFIGS}/Docker/components/81-phpapache.yaml
+	[[ -f ${CONFIGS}/Docker/components/91-postgres.yaml ]] && sudo mv ${CONFIGS}/Docker/components/91-postgres.yaml ${CONFIGS}/Docker/components/73-postgres.yaml
+	[[ -f ${CONFIGS}/Docker/components/99-network.yaml ]] && sudo mv ${CONFIGS}/Docker/components/99-network.yaml ${CONFIGS}/Docker/components/99-footer.yaml
+
+	[[ ! -f ${CONFIGS}/Docker/components/02-oauth.yaml ]] && sudo rsync -a /opt/Gooby/scripts/${PROXYVERSION}/{01-header.yaml,02-oauth.yaml,03-proxy.yaml,04-watchtower.yaml,05-autoheal.yaml,99-footer.yaml} ${CONFIGS}/Docker/components
 
 	# Finalizing upgrade