Merge branch 'v8.4base' of https://github.com/Admin9705/PlexGuide.com…

…-The-Awesome-Plex-Server into v8.4base
plexguide · Feb 21, 2019 · ff2ae87 · ff2ae87
2 parents 549313c + 00e03cd
commit ff2ae87
Show file tree

Hide file tree

Showing 9 changed files with 269 additions and 124 deletions.
diff --git a/menu/appguard/rebuild.sh b/menu/appguard/rebuild.sh
@@ -38,7 +38,8 @@ tee <<-EOF
 
 EOF
 	sleep 2
-	ansible-playbook /opt/coreapps/apps/$app.yml
+	if [ -e "/opt/coreapps/apps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
+	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/communityapps/apps/$app.yml; fi
 done
 
 echo ""

diff --git a/menu/dependency/dependency.yml b/menu/dependency/dependency.yml
@@ -9,46 +9,109 @@
 - hosts: localhost
   gather_facts: true
   tasks:
+    - name: Install Common Packages (Takes Awhile)
+      apt: "name={{item}} state=present"
+      with_items:
+        - fuse
+        - nano
+        - fail2ban
+        - wget
+        - lsb-release
+        - figlet
+        - update-notifier-common
+        - software-properties-common
+        - unrar
+        - unzip
+        - glances
+        - python-pip
+        - python3-pip
+        - python-passlib
+        - zip
+        - curl
+        - man-db
+        - htop
+        - openssh-server
+        - dirmngr
+        - npm
+        - zip
+        - apt-transport-https
+        - ca-certificates
+        - tree
+        - ncdu
+        - ctop
+        - dialog
+        - dnsutils
+        - mc
+        - apache2-utils
+        - lsof
+        - pwgen
+        - gawk
+        - python-lxml
+        - acl
+        - bc
 
-  - name: Install Common Packages (Takes Awhile)
-    apt:
-      update_cache: yes
-      name:
-      - fuse
-      - nano
-      - fail2ban
-      - wget
-      - lsb-release
-      - figlet
-      - update-notifier-common
-      - software-properties-common
-      - unrar
-      - unzip
-      - glances
-      - python-pip
-      - python3-pip
-      - python-passlib
-      - zip
-      - curl
-      - man-db
-      - htop
-      - openssh-server
-      - dirmngr
-      - npm
-      - zip
-      - apt-transport-https
-      - ca-certificates
-      - tree
-      - ncdu
-      - ctop
-      - dialog
-      - dnsutils
-      - mc
-      - apache2-utils
-      - lsof
-      - pwgen
-      - gawk
-      - python-lxml
-      - acl
-      - bc
-    #ignore_errors: yes
+
+      # apt:
+      #   name:
+      #     - fuse
+      #     - nano
+      #     - fail2ban
+      #     - wget
+      #     - lsb-release
+      #     - figlet
+      #     - update-notifier-common
+      #     - software-properties-common
+      #     - unrar
+      #     - unzip
+      #     - glances
+      #     - python-pip
+      #     - python3-pip
+      #     - python-passlib
+      #     - zip
+      #     - curl
+      #     - man-db
+      #     - htop
+      #     - openssh-server
+      #     - dirmngr
+      #     - npm
+      #     - zip
+      #     - apt-transport-https
+      #     - ca-certificates
+      #     - tree
+      #     - ncdu
+      #     - ctop
+      #     - dialog
+      #     - dnsutils
+      #     - mc
+      #     - apache2-utils
+      #     - lsof
+      #     - pwgen
+      #     - gawk
+      #     - python-lxml
+      #     - acl
+      #     - bc
+    - name: Update pip packages for python3
+      pip:
+        name:
+          - pip
+          - setuptools
+          - pyOpenSSL
+          - requests
+          - netaddr
+          - docker
+          - ansible
+        state: latest
+        executable: pip3
+
+    - name: Update pip packages for python2
+      pip:
+        name:
+          - pip
+          - setuptools
+          - pyOpenSSL
+          - requests
+          - netaddr
+          - docker
+          - ansible
+        state: latest
+        executable: pip2
diff --git a/menu/dependency/dependencydeb.yml b/menu/dependency/dependencydeb.yml
@@ -6,44 +6,108 @@
 # GNU:        General Public License v3.0
 ################################################################################
 ---
+- hosts: localhost
+  gather_facts: true
+  tasks:
+    - name: Install Common Packages (Takes Awhile)
+      apt: "name={{item}} state=present"
+      with_items:
+        - fuse
+        - nano
+        - fail2ban
+        - wget
+        - lsb-release
+        - figlet
+        - software-properties-common
+        - unrar
+        - unzip
+        - glances
+        - python-pip
+        - python3-pip
+        - python-passlib
+        - zip
+        - curl
+        - man-db
+        - htop
+        - openssh-server
+        - dirmngr
+        - zip
+        - apt-transport-https
+        - ca-certificates
+        - tree
+        - ncdu
+        - ctop
+        - dialog
+        - dnsutils
+        - mc
+        - apache2-utils
+        - lsof
+        - pwgen
+        - gawk
+        - python-lxml
+        - acl
+        - bc
+    # New ansible way of doing this, this should replace old method soon.
+    #   apt:
+    #     name:
+    #       - fuse
+    #       - nano
+    #       - fail2ban
+    #       - wget
+    #       - lsb-release
+    #       - figlet
+    #       - software-properties-common
+    #       - unrar
+    #       - unzip
+    #       - glances
+    #       - python-pip
+    #       - python3-pip
+    #       - python-passlib
+    #       - zip
+    #       - curl
+    #       - man-db
+    #       - htop
+    #       - openssh-server
+    #       - dirmngr
+    #       - zip
+    #       - apt-transport-https
+    #       - ca-certificates
+    #       - tree
+    #       - ncdu
+    #       - ctop
+    #       - dialog
+    #       - dnsutils
+    #       - mc
+    #       - apache2-utils
+    #       - lsof
+    #       - pwgen
+    #       - gawk
+    #       - python-lxml
+    #       - acl
+    #       - bc
 
-  - name: Install Common Packages (Takes Awhile)
-    apt:
-      update_cache: yes
-      name:
-      - fuse
-      - nano
-      - fail2ban
-      - wget
-      - lsb-release
-      - figlet
-      - software-properties-common
-      - unrar
-      - unzip
-      - glances
-      - python-pip
-      - python3-pip
-      - python-passlib
-      - zip
-      - curl
-      - man-db
-      - htop
-      - openssh-server
-      - dirmngr
-      - zip
-      - apt-transport-https
-      - ca-certificates
-      - tree
-      - ncdu
-      - ctop
-      - dialog
-      - dnsutils
-      - mc
-      - apache2-utils
-      - lsof
-      - pwgen
-      - gawk
-      - python-lxml
-      - acl
-      - bc
-    #ignore_errors: yes
+    - name: Update pip packages for python3
+      pip:
+        name:
+          - pip
+          - setuptools
+          - pyOpenSSL
+          - requests
+          - netaddr
+          - lxml
+          - ansible
+        state: latest
+        executable: pip3
+
+    - name: Update pip packages for python2
+      pip:
+        name:
+          - pip
+          - setuptools
+          - pyOpenSSL
+          - requests
+          - netaddr
+          - lxml
+          - ansible
+        state: latest
+        executable: pip2
diff --git a/menu/dlpath/rebuild.sh b/menu/dlpath/rebuild.sh
@@ -24,7 +24,8 @@ count=$(wc -l < /var/plexguide/container.running)
 
 for ((i=1; i<$count+1; i++)); do
 	app=$(sed "${i}q;d" /var/plexguide/container.running)
-	ansible-playbook /opt/coreapps/apps/$app.yml
+	if [ -e "/opt/coreapps/apps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
+	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/communityapps/apps/$app.yml; fi
 done
 
 echo ""

diff --git a/menu/functions/install.sh b/menu/functions/install.sh
@@ -42,24 +42,23 @@ updateprime() {
 
   echo "2" > ${abc}/pg.mergerinstall
   echo "51" > ${abc}/pg.pythonstart
-  echo "10" > ${abc}/pg.aptupdate
-  echo "149" > ${abc}/pg.preinstall
+  echo "11" > ${abc}/pg.aptupdate
+  echo "150" > ${abc}/pg.preinstall
   echo "22" > ${abc}/pg.folders
-  echo "11" > ${abc}/pg.dockerinstall
+  echo "13" > ${abc}/pg.dockerinstall
   echo "15" > ${abc}/pg.server
   echo "1" > ${abc}/pg.serverid
-  echo "25" > ${abc}/pg.dependency
+  echo "29" > ${abc}/pg.dependency
   echo "11" > ${abc}/pg.docstart
-  echo "3" > ${abc}/pg.watchtower
   echo "2" > ${abc}/pg.motd
   echo "108" > ${abc}/pg.alias
-  echo "2" > ${abc}/pg.dep
+  echo "3" > ${abc}/pg.dep
   echo "2" > ${abc}/pg.cleaner
   echo "3" > ${abc}/pg.gcloud
   echo "12" > ${abc}/pg.hetzner
   echo "1" > ${abc}/pg.amazonaws
   echo "8.4" > ${abc}/pg.verionid
-  echo "10" > ${abc}/pg.watchtower
+  echo "11" > ${abc}/pg.watchtower
   echo "1" > ${abc}/pg.installer
   echo "7" > ${abc}/pg.prune
   echo "17" > ${abc}/pg.mountcheck

diff --git a/menu/pgshield/rebuild.sh b/menu/pgshield/rebuild.sh
@@ -48,7 +48,8 @@ tee <<-EOF
 
 EOF
 	sleep 1.5
-	ansible-playbook /opt/coreapps/apps/$app.yml
+	if [ -e "/opt/coreapps/apps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
+	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/communityapps/apps/$app.yml; fi
 done
 
 echo ""

diff --git a/menu/portguard/rebuild.sh b/menu/portguard/rebuild.sh
@@ -48,7 +48,7 @@ tee <<-EOF
 EOF
 	sleep 1
 	if [ -e "/opt/coreapps/apps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
-	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
+	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/communityapps/apps/$app.yml; fi
 done
 
 echo ""
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,8 @@ tee <<-EOF @@
     EOF
     	sleep 2
-    	ansible-playbook /opt/coreapps/apps/$app.yml
+    	if [ -e "/opt/coreapps/apps/$app.yml" ]; then ansible-playbook /opt/coreapps/apps/$app.yml; fi
+    	if [ -e "/opt/coreapps/communityapps/$app.yml" ]; then ansible-playbook /opt/communityapps/apps/$app.yml; fi
     done
     echo ""
@@ Expand Down @@