PAS edits

plex_docker_user added for support for LinuxServer.io/plex update config for reading the file edit plex.sh remove touch part
MHA-Team · Dec 10, 2019 · e9d153f · e9d153f
1 parent 094d470
commit e9d153f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/menu/pgbox/endbanner.sh b/menu/pgbox/endbanner.sh
@@ -152,6 +152,7 @@ EOF
   fi
 if [ "$program" == "plex" ]; then
   tee <<-EOF
+
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 💬 Manual Configuration Required
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

diff --git a/menu/pgscan/pgscan.sh b/menu/pgscan/pgscan.sh
@@ -36,6 +36,13 @@ tokenstatus() {
   else pstatus="⚠️ NOT DEPLOYED"; fi
 }
 
+plexdockeruser() {
+plexdocker=$(cat /var/plexguide/image/plex)
+if [[ $plexdocker == "linuxserver/plex" ]];then
+ echo "abc" >/var/plexguide/pgscan/plex.docker
+ else echo "plex" >/var/plexguide/pgscan/plex.docker ; fi
+}
+
 plexcheck() {
   pcheck=$(docker ps --format {{.Names}} | grep "plex")
   if [ "$pcheck" == "" ]; then
@@ -48,7 +55,7 @@ plexcheck() {
 
 EOF
     read -p 'Confirm Info | PRESS [ENTER] ' typed </dev/tty
-    exit
+    exit 0
   fi
 }
 
@@ -69,12 +76,13 @@ token() {
     if [ "$ptoken" == "" ]; then
       tee <<-EOF
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-⛔️  WARNING! - Failed to Generate a Valid Plex Token! Exiting Deployment!
+⛔️  WARNING!   Failed to Generate a Valid Plex Token! 
+⛔️  WARNING!   Exiting Deployment!
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 EOF
       read -p 'Confirm Info | PRESS [ENTER] ' typed </dev/tty
-      exit
+      exit 0
     fi
   fi
 }
@@ -222,6 +230,7 @@ EOF
 }
 # FUNCTIONS END ##############################################################
 plexcheck
+plexdockeruser
 userstatus
 tokenstatus
 deploycheck

diff --git a/menu/plex/plex.sh b/menu/plex/plex.sh
@@ -75,7 +75,6 @@ EOF
 }
 
 updateplex() {
-touch /var/plexguide/plex.updaterole
 
   tee <<-EOF
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

diff --git a/menu/roles/plex_autoscan/tasks/main.yml b/menu/roles/plex_autoscan/tasks/main.yml
@@ -28,6 +28,10 @@
   shell: 'cat /var/plexguide/pgscan/pgscan.serverpass'
   register: plex_autoscan_server_pass
 
+- name: Register Plex Docker User
+  shell: 'cat /var/plexguide/pgscan/plex.docker'
+  register: plex_docker_user
+
 - name: Create mounted.bin for trash
   shell: 'touch /mnt/unionfs/mounted.bin'
 

diff --git a/menu/roles/plex_autoscan/templates/config.json.j2 b/menu/roles/plex_autoscan/templates/config.json.j2
@@ -43,7 +43,7 @@
    "PLEX_LOCAL_URL": "http://localhost:32400",
    "PLEX_SCANNER":"/usr/lib/plexmediaserver/Plex\\ Media\\ Scanner",
    "PLEX_SUPPORT_DIR":"/var/lib/plexmediaserver/Library/Application\\ Support",
-   "PLEX_USER":"plex",
+   "PLEX_USER":"{{plex_docker_user.stdout}}",
    "PLEX_TOKEN":"{{plex_auth_token.stdout}}",
    "PLEX_CHECK_BEFORE_SCAN":true,
    "PLEX_WAIT_FOR_EXTERNAL_SCANNERS":false,