Merge branch 'v8.5' into v8.4

This commit is contained in:
Robert Baker
2019-02-23 13:00:18 -07:00
53 changed files with 118 additions and 123 deletions

View File

@@ -33,11 +33,6 @@
register: path
ignore_errors: True
- name: Register incomplete Path
shell: 'cat /var/plexguide/server.incomplete.path'
register: incomplete
ignore_errors: True
- name: Register Auth Path
shell: 'cat /var/plexguide/server.ht'
register: auth

View File

@@ -15,7 +15,7 @@
dest: /opt/appdata
directory_mode: yes
force: yes
owner: 1000
group: 1000
owner: '1000'
group: '1000'
mode: 0755
when: copycheck.stat.exists

View File

@@ -43,8 +43,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -29,8 +29,8 @@
dest: /opt/appdata/{{pgrole}}/config.json
force: yes
mode: 0775
owner: 1000
group: 1000
owner: '1000'
group: '1000'
# LABELS ######################################################################
- name: 'Adding Traefik'
@@ -49,8 +49,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -48,8 +48,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: ConfCheck

View File

@@ -40,8 +40,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -43,8 +43,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################

View File

@@ -44,8 +44,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -39,8 +39,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -36,8 +36,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
UID: 1000
GID: 1000
UID: '1000'
GID: '1000'
GIDLIST: '1000'
# MAIN DEPLOYMENT #############################################################

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -56,8 +56,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -55,8 +55,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
VPN_ENABLED: yes
VPN_USER: vpnuser
VPN_PASS: vpnpass

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -46,8 +46,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN SCRIPT ##############################################################

View File

@@ -45,8 +45,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN SCRIPT ##############################################################

View File

@@ -43,8 +43,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
#### DB_PASSWORD: gitea
# MAIN DEPLOYMENT #############################################################

View File

@@ -48,8 +48,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
USER_ID: 1000
GROUP_ID: 1000
USER_ID: '1000'
GROUP_ID: '1000'
AUTOMATED_CONVERSION_PRESET: "Very Fast 1080p30"
AUTOMATED_CONVERSION_FORMAT: "mp4"
AUTOMATED_CONVERSION_PRESET_2: "HQ 1080p30 Surround"
@@ -63,8 +63,8 @@
file:
path: '{{path.stdout}}/handbrake/watch'
state: directory
owner: 1000
group: 1000
owner: '1000'
group: '1000'
mode: 0755
recurse: yes
@@ -72,8 +72,8 @@
file:
path: '{{path.stdout}}/handbrake/complete'
state: directory
owner: 1000
group: 1000
owner: '1000'
group: '1000'
mode: 0755
recurse: yes

View File

@@ -48,8 +48,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
USER_ID: 1000
GROUP_ID: 1000
USER_ID: '1000'
GROUP_ID: '1000'
AUTOMATED_CONVERSION_PRESET: "Very Fast 1080p30"
AUTOMATED_CONVERSION_FORMAT: "mp4"
AUTOMATED_CONVERSION_PRESET_2: "HQ 1080p30 Surround"
@@ -63,8 +63,8 @@
file:
path: '{{path.stdout}}/handbrake/watch'
state: directory
owner: 1000
group: 1000
owner: '1000'
group: '1000'
mode: 0755
recurse: yes
@@ -72,8 +72,8 @@
file:
path: '{{path.stdout}}/handbrake/complete'
state: directory
owner: 1000
group: 1000
owner: '1000'
group: '1000'
mode: 0755
recurse: yes

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -42,8 +42,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -39,8 +39,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -39,8 +39,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -60,8 +60,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
UID: 1000
GID: 1000
UID: '1000'
GID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -59,8 +59,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
UID: 1000
GID: 1000
UID: '1000'
GID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -45,8 +45,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
UID: 1000
GID: 1000
UID: '1000'
GID: '1000'
MAKEMKV_KEY: BETA
AUTO_DISC_RIPPER: 0
ENABLE_CJK_FONT: 1

View File

@@ -45,8 +45,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN SCRIPT ##############################################################

View File

@@ -46,8 +46,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN SCRIPT ##############################################################

View File

@@ -39,8 +39,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -55,8 +55,8 @@
- name: 'Setting default ENV'
set_fact:
pg_env:
USER_ID: 1000
GROUP_ID: 1000
USER_ID: '1000'
GROUP_ID: '1000'
# SECURE_CONNECTION: 1
# MAIN DEPLOYMENT #############################################################

View File

@@ -39,8 +39,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -39,8 +39,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -44,8 +44,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
- name: Create and start nextcloud container
docker_container:
@@ -55,8 +55,8 @@
published_ports:
- '127.0.0.0.1:4645:443'
env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
volumes: '{{pg_volumes}}'
networks:
- name: plexguide

View File

@@ -39,8 +39,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -39,8 +39,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -44,8 +44,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN SCRIPT ##############################################################

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN SCRIPT ##############################################################

View File

@@ -60,8 +60,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploy {{pgrole}} Container - OverRide'

View File

@@ -54,8 +54,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################

View File

@@ -42,8 +42,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN SCRIPT ##############################################################

View File

@@ -42,8 +42,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN SCRIPT ##############################################################

View File

@@ -38,8 +38,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -46,8 +46,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
UID: 1000
GID: 1000
UID: '1000'
GID: '1000'
DOMAIN: {{pgrole}}.{{domain.stdout}}
# MAIN DEPLOYMENT #############################################################

View File

@@ -53,8 +53,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: xmlcheck

View File

@@ -32,8 +32,8 @@
dest: '/opt/appdata/{{pgrole}}/{{pgrole}}/config.json'
directory_mode: yes
force: yes
owner: 1000
group: 1000
owner: '1000'
group: '1000'
mode: 0755
when: not jsoncheck.stat.exists
@@ -56,8 +56,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -40,8 +40,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -41,8 +41,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'

View File

@@ -44,8 +44,8 @@
- name: 'Setting PG ENV'
set_fact:
pg_env:
PUID: 1000
PGID: 1000
PUID: '1000'
PGID: '1000'
# MAIN DEPLOYMENT #############################################################