HawksRepos · HawksRepos · Jan 17, 2020 · Jan 17, 2020 · Jan 17, 2020 · Jan 18, 2020
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Error Logs**
+If applicable, add any error logs you are seeing to help problem-solving.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,128 +1,154 @@
+**PTS is currently in maintenance mode and is considered feature complete.** From time-to-time developers will take it upon themselves to add new containers to Community-Apps as requested and update the Core-Apps whenever required.
+
+We consider PTS to be a remarkable collaborative achievement and take pride in the fact we have built a solid foundation for any person to setup and learn basic Linux and also run a media server with minimal effort.
+
+We encourage anyone wanting to contribute to the project in the future to join our community, this is also where we provide support: https://discord.gg/cKsMwMZ
+
+Thanks to our valued contributors over the past couple of years, you have helped create something to be proud of and that will serve the community well into the future.
+
+**You know who you are.** PTS is forever, others will come and go.
 
 _**Table of Contents**_
 
 1. [Install](#1-install)
 2. [Project Statement](#2-project-statement)
 3. [Functional Use](#3-functional-use)
-4. [Testimonials](#4-testimonials)
-5. [Recommended Reading](#5-recommended-reading)
-6. [Having Issues?](#6-having-issues)
-
+4. [Recommended Reading](#5-recommended-reading)
+5. [Having Issues?](#6-having-issues)
 
 ----
 
 # 1. Install
 
-## (i) Backup your current server using PTS Vault before installing PTS.   
-  
+## (i) Backup your current server using PTS Vault before installing PTS-Team.   
+
 Your PTS backup can be used to restore your applications in PTS fork after install (see later)  
 **NOTE**  Tested and working for PG v8.5-8.7
-  
+
 Type the following to access your current build's menu: `sudo pgblitz`    
 Select  `[7] PG vault [Backup & Restore]`  then  
-Select  `[1] Utlizie PG Vault`  then  
-Select  `[1] Data Backup`  - 
+Select  `[1] Utilize PG Vault`  then  
+Select  `[1] Data Backup`
 
 At this stage you can either type `all` (to backup all apps) OR `appname` (to queue/stack apps which you would like to backup) followed by typing `A`.  
-  
+
 
 **IMPORTANT**
 If you have an encrypted drive and have forgotten, not documented or not backed up your SALT/password for PG Clone, you should at this stage also backup your keys/rclone.config to gdrive. This can be done by the following:  
 
 Type or paste the following to backup your keys:
 ```
-sudo wget -N https://raw.githubusercontent.com/PTS-Team/PTS-Clone/final/functions/backup-keys.sh
+sudo wget -N https://raw.githubusercontent.com/MHA-Team/PTS-Clone/final/functions/backup-keys.sh
 
 ```  
-  
-    
+
+
 ## (ii) Installing PTS
 
 **NOTE**
-The ideal method of installing the PTS fork is to delete your current build and install PTS fork on a clean system. 
-PTS fork works best on **ubuntu 18.XX** and this tutorial will assume you are using ubuntu 18.XX. 
+The ideal method of installing the PTS fork is to delete your current build and install PTS fork on a clean system.
+PTS fork works best on **ubuntu 18.XX** and this tutorial will assume you are using ubuntu 18.XX.
 If you are unsure on how to do this, please refer to the documentation provided by your server provider.  
 
 Once your server has an OS installed, login to your server using SSH.  
-    
+
 Type or paste the following to install PTS fork:  
 
 ```
 sudo apt-get update -yqq
 sudo apt-get upgrade -yqq
 sudo apt-get autoclean -yqq
-sudo apt-get install wget -y 
-sudo wget -qO- https://raw.githubusercontent.com/PTS-Team/Install/master/install.sh | sudo bash
+sudo apt-get install wget -y
+sudo wget -qO- https://raw.githubusercontent.com/MHA-Team/Install/master/install.sh | sudo bash
 
 ```
-  
+
 The installation will then take you through the setup which is self-explanatory.  
-
 
 ### Alternative method of installing PTS fork (without removing your current build)
 
 **NOTE** This has currently only been tested with PG v8.5-8.7  
 
 Type or paste the following:
- 
+
 ```
 sudo apt-get update -yqq
 sudo apt-get upgrade -yqq
 sudo apt-get autoclean -yqq
-sudo apt-get install wget -y 
-sudo wget -qO- https://raw.githubusercontent.com/PTS-Team/Install/master/install.sh | sudo bash
+sudo apt-get install wget -y
+sudo wget -qO- https://raw.githubusercontent.com/MHA-Team/Install/master/install.sh | sudo bash
 
 ```    
+### Optional - updating your PTS-Team fork to the new MHA-Team fork
+IDoMnCi came up with a great script to change all the links on an existing PTS-Team fork (NOT PG 8.x) to the MHA-Team fork.
+Details - https://github.com/MHA-Team/Install/pull/4
+```
+sudo wget -qO- https://raw.githubusercontent.com/MHA-Team/Install/master/relocate.sh | sudo bash
+
+sudo ptsupdate
+
+```
+
+### Testing Only - Not Supported - Install PTS-Team fork via Windows 10 20H1 WSL2 Ubuntu 18.04
+
+Sammykins has tested installing the PTS-Team form on a Windows 10 machine via the new WSL2 system built into Windows.
+Follow the above (#ii-installing-pts) in a WSL2 terminal shell, if you do not know how to enable WSL2 and install an Ubuntu 18.04 system for this method it is recommended not to install.
+
+DO NOT ASK FOR SUPPORT OR FIXES FOR THIS METHOD IT IS PROVIDED AS-IS AND WE TAKE NO RESPONSIBILITY IF ANYTHING BELOW DOES NOT FUNCTION OR BREAKS YOUR WINDOWS 10 INSTALLATION. YOU DO THE BELOW AT YOUR OWN RISK.
+
+* Follow the following page to install and setup WSL2 ([see here](https://docs.microsoft.com/en-us/windows/wsl/install-win10))
+* Only use an Ubuntu 18.04 VM from the Microsoft Store
+* Prior to install follow this to enable systemd: ([see here](https://github.com/DamionGans/ubuntu-wsl2-systemd-script))
+* The script may fail to create the plexguide network in docker, simply run `docker network create plexguide` to fix
+* Use MultiHD to set another drive as the main path for data, we recommend this if your C drive is too small as WSL2 will default run on the OS drive, e.g. if you have a D: drive, this would be `/mnt/d/pathtoanewfolderforptsfiles`
+* Follow the rest of the guides for configuring PTS
+
+## Configuring PTS
 
-## Configuring PTS 
-
 Configuring PTS fork is the same as configuring PG / PlexGuide.
-  
+
 Then type the following to run the PTS menu: `sudo pts`
 
-* Set up and deploy Traefik ([see here](https://github.com/PTS-Team/PTS-Team/wiki/Traefik))   
+* Set up and deploy Traefik ([see here](https://github.com/MHA-Team/PTS-Team/wiki/Traefik))   
 
-* Close ports using Port Guard ([see here](https://github.com/PTS-Team/PTS-Team/wiki/PTS-Port-Guard))  
+* Close ports using Port Guard ([see here](https://github.com/MHA-Team/PTS-Team/wiki/PTS-Port-Guard))  
 
-* Deploy PTS Shield (GOAuth - all apps supported) [see here](https://github.com/PTS-Team/PTS-Team/wiki/PTS-Shield)
+* Deploy PTS Shield (GOAuth - all apps supported) [see here](https://github.com/MHA-Team/PTS-Team/wiki/PTS-Shield)
 
-* Set up and deploy PTS-Clone. You can restore you backup keys at this stage. [see here](https://github.com/PTS-Team/PTS-Team/wiki/PTS-Clone)
+* Set up and deploy PTS-Clone. You can restore you backup keys at this stage. [see here](https://github.com/MHA-Team/PTS-Team/wiki/PTS-Clone)
 
-* (Optional) Restore PTS backup (created in step 1) using PTS-Vault. [see here](https://github.com/PTS-Team/PTS-Team/wiki/PTS-Vault---Data-Storage)
+* (Optional) Restore PTS backup (created in step 1) using PTS-Vault. [see here](https://github.com/MHA-Team/PTS-Team/wiki/PTS-Vault---Data-Storage)
 
-* Install desired core/community applications (Do this regardless of whether it is a fresh install with restore or overwrite)  [see here](https://github.com/PTS-Team/PTS-Team/wiki/core-apps)
+* Install desired core/community applications (Do this regardless of whether it is a fresh install with restore or overwrite)  [see here](https://github.com/MHA-Team/PTS-Team/wiki/core-apps)
+
+* (Optional) If overwriting/restoring, you will need to change 2 remote path mappings in applications (NZB clients / Torrent clients / radarr / sonarr / lidarr etc)    [see here](https://github.com/MHA-Team/PTS-Team/wiki/Remote-Path-Mappings)
 
-* (Optional) If overwriting/restoring, you will need to change 2 remote path mappings in applications (NZB clients / Torrent clients / radarr / sonarr / lidarr etc)    [see here](https://github.com/PTS-Team/PTS-Team/wiki/Remote-Path-Mappings)
-
-
 **Why do I need to change remote paths?**  
+
 PTS will create one download folder for completed downloads using any NZB client `/mnt/downloads/nzb` and one download folder for completed downloads using any torrent client `/mnt/downloads/torrent`. Both folder names are different to those used in previous versions of PTS. This remote paths need to be changed in your configuration settings (nzbget/radarr/sonarr etc) which you can do in either in terminal or webUI.  
-  
+
 **NOTE**  PTS fork does **not** install PGUI by default.   
-  
+
 # 2. Project Statement
 
 PTS  is a **fork** of PG / Plexguide, an all-in-one media solution that deploys a Media Server through the use of either your local HDD or Google Drive; serving as unlimited back-end storage. PTS utilizes Ansible and Docker to streamline your Media Server while deploying multiple tools for your server operations.
- 
+
 # 3. Functional Use
 
 1. Deploys multiple programs/apps and functional within 10 - 30 seconds
 1. Deploy PTS on a remote machine, local machine, VPS, or virtual machines
 1. Deploy PTS utilizing Google's GSuite for unlimited space or through the solo or multiple HD editions
 1. Deploys a Reverse Proxy (Traefik) so you can obtain https:// certificates on all your containers
 1. Backup and Restore data through your Google Drive
-1. Aligns data and ports for efficiency 
+1. Aligns data and ports for efficiency
 1. Deploys with a simple installer and a GUI like interface (commands do not have to be typed out)
 
-# 4. Testimonials
-
-..... 
-
+.....
 
-# 5. Recommended Reading
+# 4. Recommended Reading
 
-[**[Click Here]**](https://github.com/PTS-Team/PTS-Team/wiki/Pre-Reading) to view the list!
+[**[Click Here]**](https://github.com/MHA-Team/PTS-Team/wiki/Pre-Reading) to view the list!
 
-## 6. Having Issues?
+## 5. Having Issues?
 
-[**[Click Here]**](https://github.com/PTS-Team/PTS-Team/wiki/Common-Issues) for more information!
+[**[Click Here]**](https://github.com/MHA-Team/PTS-Team/wiki/Common-Issues) for more information!
diff --git a/menu/alias/templates/autoupdatepts b/menu/alias/templates/autoupdatepts
@@ -6,10 +6,10 @@
 ################################################################################
 rm -rf /opt/ptsupdate 1>/dev/null 2>&1
 mkdir -p /opt/ptsupdate 1>/dev/null 2>&1
-git clone --single-branch https://github.com/PTS-Team/PTS-Update.git /opt/ptsupdate 1>/dev/null 2>&1
+git clone --single-branch https://github.com/MHA-Team/PTS-Update.git /opt/ptsupdate 1>/dev/null 2>&1
 chown -cR 1000:1000 /opt/ptsupdate 1>/dev/null 2>&1 
 chmod -cR 775 /opt/ptsupdate 1>/dev/null 2>&1
 
 source /opt/ptsupdate/autoupdate/update.sh
 
-start0
+start0
diff --git a/menu/alias/templates/ptsupdate b/menu/alias/templates/ptsupdate
@@ -6,10 +6,10 @@
 ################################################################################
 rm -rf /opt/ptsupdate 1>/dev/null 2>&1
 mkdir -p /opt/ptsupdate 1>/dev/null 2>&1
-git clone --single-branch https://github.com/PTS-Team/PTS-Update.git /opt/ptsupdate 1>/dev/null 2>&1
+git clone --single-branch https://github.com/MHA-Team/PTS-Update.git /opt/ptsupdate 1>/dev/null 2>&1
 chown -cR 1000:1000 /opt/ptsupdate 1>/dev/null 2>&1 
 chmod -cR 775 /opt/ptsupdate 1>/dev/null 2>&1
 
 source /opt/ptsupdate/autoupdate/update.sh
 
-start0
+start0
diff --git a/menu/commands/scommands.log b/menu/commands/scommands.log
@@ -49,7 +49,7 @@
       command: rcupdate
       Info: Open rClone update interface
 
-    - name: Install mergerfes updater
+    - name: Install mergerfs updater
       command: mgupdate
       Info: Open mergerfs update interface    
 

diff --git a/menu/cron/mass.sh b/menu/cron/mass.sh
@@ -49,7 +49,7 @@ question1() {
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ⌛ PTS Cron - Schedule Cron Jobs (Backups) | Mass Program Interface
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-⚡ Reference: https://github.com/PTS-Team/PTS-Team/wiki/PTS-Cron
+⚡ Reference: https://github.com/MHA-Team/PTS-Team/wiki/PTS-Cron
 
 [1] No  [Skip   - All Cron Jobs]
 [2] Yes [Manual - Select for Each App]

diff --git a/menu/functions/autoheal.yml b/menu/functions/autoheal.yml
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Title:      autoheal 
+# GNU:        General Public License v3.0
+################################################################################
+---
+- hosts: localhost
+  gather_facts: false
+  tasks:
+    # FACTS #######################################################################
+    - name: 'Set Known Facts'
+      set_fact:
+        pgrole: 'autoheal'
+        image: 'willfarrell/autoheal'
+    - name: 'Setting {{pgrole}} Volumes'
+      set_fact:
+        pg_volumes:
+          - '/var/run/docker.sock:/var/run/docker.sock'
+          - '/etc/localtime:/etc/localtime:ro'
+
+    - name: 'Setting {{pgrole}} ENV'
+      set_fact:
+        pg_env:
+          AUTOHEAL_CONTAINER_LABEL: 'all'
+          AUTOHEAL_INTERVAL: '5'
+          AUTOHEAL_START_PERIOD: '0'
+          AUTOHEAL_DEFAULT_STOP_TIMEOUT: '10'
+          CURL_TIMEOUT: '30'
+          DOCKER_SOCK: '/var/run/docker.sock'
+
+    # MAIN DEPLOYMENT #############################################################
+    - name: 'Deploying {{pgrole}}'
+      docker_container:
+        name: '{{pgrole}}'
+        image: '{{image}}'
+        pull: yes
+        volumes: '{{pg_volumes}}'
+        env: '{{pg_env}}'
+        restart_policy: unless-stopped
+        networks:
+          - name: plexguide
+            aliases:
+              - 'autoheal'
+        state: started