Revert "Revert "Merge branch 'v8.5base' into v8.4base""

This reverts commit 6476955.

README.md

@@ -3,10 +3,10 @@
 📂 [**Click Here**](https://controlpanel.newshosting.com/signup/index.php?promo=partners&a_aid=5a65169240efd&a_bid=5ecfe99b) - NZB's with from NewsHost - PG Members Receive a 58% Discount
 
 <p align="center">
-  <a href="https://plexguide.com/forums" target="_blank"><img src="https://plexguide.com/wikipics/logo-forums.png" width="160"/>   
-  <a href="https://github.com/Admin9705/PlexGuide.com-The-Awesome-Plex-Server/wiki" target="_blank"><img src="https://plexguide.com/wikipics/logo-wiki.png" width="160"/>
-  <a href="https://plexguide.com/threads/plexguide-install-instructions.243/" target="_blank"><img src="https://plexguide.com/wikipics/logo-pg-install.png" width="160"/>
-  <a href="https://plexguide.com/account/upgrades" target="_blank"><img src="https://plexguide.com/wikipics/logo-donate.png" width="160"/>
+  <a href="https://pgblitz.com/forums" target="_blank"><img src="https://pgblitz.com/wikipics/logo-forums.png" width="160"/>   
+  <a href="https://github.com/Admin9705/PlexGuide.com-The-Awesome-Plex-Server/wiki" target="_blank"><img src="https://pgblitz.com/wikipics/logo-wiki.png" width="160"/>
+  <a href="https://pgblitz.com/threads/plexguide-install-instructions.243/" target="_blank"><img src="https://pgblitz.com/wikipics/logo-pg-install.png" width="160"/>
+  <a href="https://pgblitz.com/account/upgrades" target="_blank"><img src="https://plexguide.com/wikipics/logo-donate.png" width="160"/>
 </p> 
 
 _**Table of Contents**_
@@ -19,14 +19,14 @@ _**Table of Contents**_
 
 ----
 # 1. General Intro
-<p align="center"><kbd><img src="https://plexguide.com/wikipics/pglogo-move.gif" width="600""></kbd></p>
+<p align="center"><kbd><img src="https://pgblitz.com/wikipics/pglogo-move.gif" width="600""></kbd></p>
 <p align="center"><b>Manage PlexGuide - AnyTime, Anywhere!</b></p>
 
 **Mission Statement:** PlexGuide is an all-in-one media solution that deploys a Media Server through the use of your Local HD or Google Drive; serving as an unlimited back-end storage. PlexGuide utilizes Ansible and Docker to streamline your Media Server, while deploying multiple tools for your Server Operations.
 
 # 2. YouTube Video - Intro
 <p align="center">
-<a href="http://www.youtube.com/watch?v=FkQ5sOcJGjs"><img src="https://plexguide.com/wikipics/pg-introv4.png" width="600"/></p>
+<a href="http://www.youtube.com/watch?v=FkQ5sOcJGjs"><img src="https://pgblitz.com/wikipics/pg-introv4.png" width="600"/></p>
 <p align="center"><b>PG Introduction Video</b></p>
 
 # 3. Functional Use
@@ -40,18 +40,18 @@ _**Table of Contents**_
 1. Deploys with a simple installer and a GUI like interface (commands do not have to be typed out)
 
 # 4. Testimonials
-<p align="center"><kbd><img src="https://plexguide.com/wikipics/pg-assistyou.gif" width="600""></kbd></p>
+<p align="center"><kbd><img src="https://pgblitz.com/wikipics/pg-assistyou.gif" width="600""></kbd></p>
 
-[**Dexxa:**](https://plexguide.com/threads/cant-install-plex-guide.1005/#post-5724) Cant believe how it easy it was to install plex and link plex to my gdrive, when i just knew how to install plex on its on, i tried many ways to mount gdrive to my plex and couldnt get it to work, but this did it for me in minutes, I'll be using this script from now on, on all my servers, thank you.
+[**Dexxa:**](https://pgblitz.com/threads/cant-install-plex-guide.1005/#post-5724) Cant believe how it easy it was to install plex and link plex to my gdrive, when i just knew how to install plex on its on, i tried many ways to mount gdrive to my plex and couldnt get it to work, but this did it for me in minutes, I'll be using this script from now on, on all my servers, thank you.
 
-[**Cyb3rGh05t:**](https://plexguide.com/threads/thank-you-pg-team.942/) hi PlexGuide Team, just want to say thank you to the PlexGuide Team :) you did an amazing job:) Everything is really easy to setup an the interface is also very nice :) Thanks for all the hard work an all the support :) you guys rock :) .Keep up that good work. looking further for new features on PlexGuide :) thanks :)
+[**Cyb3rGh05t:**](https://pgblitz.com/threads/thank-you-pg-team.942/) hi PlexGuide Team, just want to say thank you to the PlexGuide Team :) you did an amazing job:) Everything is really easy to setup an the interface is also very nice :) Thanks for all the hard work an all the support :) you guys rock :) .Keep up that good work. looking further for new features on PlexGuide :) thanks :)
 
 # 5. Conclusion
 
-Well anyways, welcome to the Site! Visit the forums @ [**https://plexguide.com/forums**](https://plexguide.com/forums).
+Well anyways, welcome to the Site! Visit the forums @ [**https://pgblitz.com/forums**](https://plexguide.com/forums).
 
 <p align="right">
-<a href="https://plexguide.com" target="_blank"><img src="https://plexguide.com/wikipics/logo.png" width="75"/>
+<a href="https://plexguide.com" target="_blank"><img src="https://pgblitz.com/wikipics/logo.png" width="75"/>
 </p>
 
 ST2 which is now PGBlitz Concept: [Flicker-Rate](https://github.com/flicker-rate)
@@ -62,4 +62,4 @@ ST2 which is now PGBlitz Concept: [Flicker-Rate](https://github.com/flicker-rate
 Below is a Funny, but True Process Made By [Flicker-Rate](https://github.com/flicker-rate)
 
 ----
-[![N|Solid](https://i.imgur.com/chNkIx6.png)](https://plexguide.com/threads/pg-build-guide-which-programs-do-i-pick.759/)
+[![N|Solid](https://i.imgur.com/chNkIx6.png)](https://pgblitz.com/threads/pg-build-guide-which-programs-do-i-pick.759/)

menu/ending/ending.sh

@@ -5,6 +5,9 @@
 # URL:        https://plexguide.com - http://github.plexguide.com
 # GNU:        General Public License v3.0
 ################################################################################
+source /opt/plexguide/menu/functions/install.sh
+emergency
+
 # PG ascii art with color
 echo ""
 cat << "EOF"

menu/functions/install.sh

@@ -22,7 +22,7 @@ updateprime() {
   variable /var/plexguide/tld.program "portainer"
   variable /opt/appdata/plexguide/plextoken ""
   variable /var/plexguide/server.ht ""
-  variable /var/plexguide/server.email "changeme@badmail.com"
+  variable /var/plexguide/server.email "NOT-SET"
   variable /var/plexguide/server.domain "NOT-SET"
   variable /var/plexguide/pg.number "New-Install"
   variable /var/plexguide/emergency.log ""
@@ -61,7 +61,7 @@ updateprime() {
   echo "11" > ${abc}/pg.watchtower
   echo "1" > ${abc}/pg.installer
   echo "7" > ${abc}/pg.prune
-  echo "17" > ${abc}/pg.mountcheck
+  echo "20" > ${abc}/pg.mountcheck
 
 }
 
@@ -76,7 +76,11 @@ pginstall () {
   core mergerinstall
   core dockerinstall
   core docstart
+
+  # Roles Ensure that PG Replicates and has once if missing; important for startup, cron and etc
   pgcore
+  pgcommunity
+
   portainer
   pgui
   core motd &>/dev/null &
@@ -297,12 +301,9 @@ portainer () {
   fi
 }
 
-pgcore() {
-  file="/opt/coreapps/place.holder"
-    if [ ! -e "$file" ]; then
-      ansible-playbook /opt/plexguide/menu/pgbox/pgboxcore.yml;
-    fi
-}
+# Roles Ensure that PG Replicates and has once if missing; important for startup, cron and etc
+pgcore() { if [ ! -e "/opt/coreapps/place.holder" ]; then ansible-playbook /opt/plexguide/menu/pgbox/pgboxcore.yml; fi }
+pgcommunity() { if [ ! -e "/opt/communityapps/place.holder" ]; then ansible-playbook /opt/plexguide/menu/pgbox/pgboxcommunity.yml; fi }
 
 pgui ()
 {

menu/pgbox/pgboxcommunity.yml

@@ -16,5 +16,5 @@
       git:
         repo: "https://github.com/Admin9705/PlexGuide-Community"
         dest: /opt/communityapps
-        version: "v8.4"
+        version: "v8.5"
         force: yes

menu/pgbox/pgboxcore.yml

@@ -16,5 +16,5 @@
       git:
         repo: "https://github.com/Admin9705/PlexGuide-Core"
         dest: /opt/coreapps
-        version: "v8.4"
+        version: "v8.5"
         force: yes

menu/pgcloner/hcloud.sh

@@ -10,7 +10,7 @@
 echo 'hcloud' > /var/plexguide/pgcloner.rolename
 echo 'HCloud (Hetzner)' > /var/plexguide/pgcloner.roleproper
 echo 'PlexGuide-HCloud-Hetzner' > /var/plexguide/pgcloner.projectname
-echo 'v8.4' > /var/plexguide/pgcloner.projectversion
+echo 'v8.5' > /var/plexguide/pgcloner.projectversion
 
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 echo "💬 HCloud in conjuction with PlexGuide enables users to

menu/pgcloner/pgclone.sh

@@ -10,7 +10,7 @@
 echo 'pgclone' > /var/plexguide/pgcloner.rolename
 echo 'PG Clone' > /var/plexguide/pgcloner.roleproper
 echo 'PlexGuide-PGClone' > /var/plexguide/pgcloner.projectname
-echo 'v8.4' > /var/plexguide/pgcloner.projectversion
+echo 'v8.5' > /var/plexguide/pgcloner.projectversion
 
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 echo "💬 PG Clone utilizes RClone's Mounts + MergerFS's Union" > /var/plexguide/pgcloner.info

menu/pgcloner/pggce.sh

@@ -10,7 +10,7 @@
 echo 'pggce' > /var/plexguide/pgcloner.rolename
 echo 'PG GCE' > /var/plexguide/pgcloner.roleproper
 echo 'PlexGuide-GCE' > /var/plexguide/pgcloner.projectname
-echo 'v8.4' > /var/plexguide/pgcloner.projectversion
+echo 'v8.5' > /var/plexguide/pgcloner.projectversion
 
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 echo "💬 PG Google GCE scripts are setup so that users can deploy any

menu/pgcloner/pgpatrol.sh

@@ -10,7 +10,7 @@
 echo 'pgpatrol' > /var/plexguide/pgcloner.rolename
 echo 'PG Patrol' > /var/plexguide/pgcloner.roleproper
 echo 'PlexGuide-PGPatrol' > /var/plexguide/pgcloner.projectname
-echo 'v8.4' > /var/plexguide/pgcloner.projectversion
+echo 'v8.5' > /var/plexguide/pgcloner.projectversion
 
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 echo "💬 PG Patrol can boot idle plex users, users utilizing multiple

menu/pgcloner/solo/pgui.sh

@@ -10,7 +10,7 @@
 echo 'pgui' > /var/plexguide/pgcloner.rolename
 echo 'UI' > /var/plexguide/pgcloner.roleproper
 echo 'PlexGuide-UI' > /var/plexguide/pgcloner.projectname
-echo 'v8.4.5' > /var/plexguide/pgcloner.projectversion
+echo 'v8.5' > /var/plexguide/pgcloner.projectversion
 
 ### START PROCESS
 ansible-playbook /opt/plexguide/menu/pgcloner/core/primary.yml

menu/pgcloner/traefik.sh

@@ -10,7 +10,7 @@
 echo 'traefik' > /var/plexguide/pgcloner.rolename
 echo 'Traefik' > /var/plexguide/pgcloner.roleproper
 echo 'PlexGuide-Traefik' > /var/plexguide/pgcloner.projectname
-echo 'v8.4' > /var/plexguide/pgcloner.projectversion
+echo 'v8.5' > /var/plexguide/pgcloner.projectversion
 
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 echo "💬 Traefik is a modern HTTP reverse proxy and load balancer that makes

menu/pgui/mountcheck.sh

@@ -6,6 +6,7 @@
 # GNU:        General Public License v3.0
 ################################################################################
 mkdir -p /opt/appdata/plexguide/emergency
+mkdir -p /opt/appdata/plexguide
 rm -rf /opt/appdata/plexguide/emergency/*
 sleep 15
 diskspace27=0
@@ -65,12 +66,29 @@ fi
 
 ##### Warning for Ports Open with Traefik Deployed
 if [[ $(cat /var/plexguide/pg.ports) != "Closed" && $(docker ps --format '{{.Names}}' | grep "traefik") == "traefik" ]]; then
-  echo "Warning: Traefik deployed with ports open! PGShield will be unavailable until you close them!" > /opt/appdata/plexguide/emergency/message.a
+  echo "Warning: Traefik deployed with ports open! Server at risk for explotation!" > /opt/appdata/plexguide/emergency/message.a
 elif [ -e "/opt/appdata/plexguide/emergency/message.a" ]; then rm -rf /opt/appdata/plexguide/emergency/message.a; fi
 
 if [[ $(cat /var/plexguide/pg.ports) == "Closed" && $(docker ps --format '{{.Names}}' | grep "traefik") == "" ]]; then
-  echo "Warning: Apps Cannot Be Accessed! Ports are Closed & Traefik is not enabled! Either deploy traefik or open your ports (which is worst for security)" > /opt/appdata/plexguide/emergency/message.a
+  echo "Warning: Apps Cannot Be Accessed! Ports are Closed & Traefik is not enabled! Either deploy traefik or open your ports (which is worst for security)" > /opt/appdata/plexguide/emergency/message.b
 elif [ -e "/opt/appdata/plexguide/emergency/message.b" ]; then rm -rf /opt/appdata/plexguide/emergency/message.b; fi
+##### Warning for Bad Traefik Deployment - message.c is tied to traefik showing a status! Do not change unless you know what your doing
+touch /opt/appdata/plexguide/traefik.check
+domain=$(cat /var/plexguide/server.domain)
+wget -q "https://portainer.${domain}" -O "/opt/appdata/plexguide/traefik.check"
+if [[ $(cat /opt/appdata/plexguide/traefik.check) == "" && $(docker ps --format '{{.Names}}' | grep traefik) == "traefik" ]]; then
+  echo "Traefik is Not Deployed Properly! Cannot Reach the Portainer SubDomain!" > /opt/appdata/plexguide/emergency/message.c
+else
+  if [ -e "/opt/appdata/plexguide/emergency/message.c" ]; then
+  rm -rf /opt/appdata/plexguide/emergency/message.c; fi
+fi
+##### Warning for Traefik Rate Limit Exceeded
+if [[ $(cat /opt/appdata/plexguide/traefik.check) == "" && $(docker logs traefik | grep "rateLimited") != "" ]]; then
+  echo "$domain's rated limited exceed | Traefik (LetsEncrypt)! Takes upto one week to clear up (or use a new domain)" > /opt/appdata/plexguide/emergency/message.d
+else
+  if [ -e "/opt/appdata/plexguide/emergency/message.d" ]; then
+  rm -rf /opt/appdata/plexguide/emergency/message.d; fi
+fi
 
 ################# Generate Output
 echo "" > /var/plexguide/emergency.log