From 73242d45b0589bb36dc5797da14adc293713a593 Mon Sep 17 00:00:00 2001 From: Robert Baker Date: Fri, 1 Feb 2019 11:40:43 -0700 Subject: [PATCH] community fixes --- apps/beets.yml | 3 ++- apps/deezloaderremix.yml | 3 ++- apps/handbrake2.yml | 2 +- apps/jdownloader2.yml | 1 + apps/makemkv.yml | 17 ----------------- apps/mellow.yml | 1 - apps/monitorr.yml | 1 - apps/mylar.yml | 1 - apps/nextcloud.yml | 9 --------- apps/nowshowing.yml | 1 - apps/radarr4k.yml | 28 ---------------------------- apps/radarrhdr.yml | 28 ---------------------------- apps/sonarr4k.yml | 28 ---------------------------- apps/sonarrhdr.yml | 28 ---------------------------- apps/syncthing.yml | 2 +- apps/ubooquity.yml | 1 - 16 files changed, 7 insertions(+), 147 deletions(-) diff --git a/apps/beets.yml b/apps/beets.yml index 0503305..7a92541 100644 --- a/apps/beets.yml +++ b/apps/beets.yml @@ -43,7 +43,8 @@ - '/opt/appdata/{{pgrole}}:/config' - '/etc/localtime:/etc/localtime:ro' - '{{path.stdout}}:{{path.stdout}}' - + - '/mnt:/mnt' + - name: 'Setting PG ENV' set_fact: pg_env: diff --git a/apps/deezloaderremix.yml b/apps/deezloaderremix.yml index 30719ea..36debea 100644 --- a/apps/deezloaderremix.yml +++ b/apps/deezloaderremix.yml @@ -36,7 +36,8 @@ - '/opt/appdata/{{pgrole}}:/config' - '{{path.stdout}}:{{path.stdout}}' - '/etc/localtime:/etc/localtime:ro' - + - '/mnt:/mnt' + - name: 'Setting PG ENV' set_fact: pg_env: diff --git a/apps/handbrake2.yml b/apps/handbrake2.yml index 77c9138..41aaaea 100644 --- a/apps/handbrake2.yml +++ b/apps/handbrake2.yml @@ -43,7 +43,7 @@ - '/opt/appdata/{{pgrole}}/config:/config:rw' - '/:/storage:ro' - '{{path.stdout}}:{{path.stdout}}' - - '/mnt/unionfs:/mnt/unionfs' + - '/mnt:/mnt' - '{{path.stdout}}/{{pgrole}}/watch/Very_Fast_1080p30:/watch:rw' - '{{path.stdout}}/{{pgrole}}/watch/HQ_1080p30_Surround:/watch2:rw' - '{{path.stdout}}/{{pgrole}}/watch/1080mkv:/watch3:rw' diff --git a/apps/jdownloader2.yml b/apps/jdownloader2.yml index 6e7cdd6..6110d2c 100644 --- a/apps/jdownloader2.yml +++ b/apps/jdownloader2.yml @@ -63,6 +63,7 @@ - '/opt/appdata/{{pgrole}}:/config' - '{{path.stdout}}:{{path.stdout}}' - '/mnt/unionfs:/unionfs' + - '/mnt:/mnt' - '{{path.stdout}}/downloads/{{pgrole}}/:/output:rw' - '/etc/localtime:/etc/localtime:ro' diff --git a/apps/makemkv.yml b/apps/makemkv.yml index 6c0fbbc..da9bef8 100644 --- a/apps/makemkv.yml +++ b/apps/makemkv.yml @@ -24,23 +24,6 @@ - name: 'Including cron job' include_tasks: '/opt/plexguide/containers/_core.yml' - # MIGRATIONS (REMOVE SECTION ON MARCH 1st) ############################################################# - - name: 'Check for old volumes' - stat: - path: '{{path.stdout}}/{{pgrole}}' - register: oldcheck - - - name: 'Migrations' - block: - - name: 'Creating new downloads location' - command: 'mkdir -p {{path.stdout}}/downloads/{{pgrole}}' - - - name: 'Chown download folder' - shell: 'chown -R 1000:1000 {{path.stdout}}/downloads/{{pgrole}}/' - - - name: 'Chmod download folder' - shell: 'chmod -R 775 {{path.stdout}}/downloads/{{pgrole}}/' - - name: 'Ini Check' stat: path: /opt/appdata/{{pgrole}}/core.conf diff --git a/apps/mellow.yml b/apps/mellow.yml index 11cc683..b28ae39 100644 --- a/apps/mellow.yml +++ b/apps/mellow.yml @@ -28,7 +28,6 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' - name: 'Setting PG Volumes' diff --git a/apps/monitorr.yml b/apps/monitorr.yml index 30e96f1..2e3031e 100644 --- a/apps/monitorr.yml +++ b/apps/monitorr.yml @@ -28,7 +28,6 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' - name: 'Setting PG Volumes' diff --git a/apps/mylar.yml b/apps/mylar.yml index 1d94240..eb49636 100644 --- a/apps/mylar.yml +++ b/apps/mylar.yml @@ -28,7 +28,6 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' - name: 'Setting PG Volumes' diff --git a/apps/nextcloud.yml b/apps/nextcloud.yml index 4b91f64..ade15b5 100644 --- a/apps/nextcloud.yml +++ b/apps/nextcloud.yml @@ -21,15 +21,6 @@ - name: 'Including cron job' include_tasks: '/opt/plexguide/containers/_core.yml' - # EXTRA ####################################################################### - - name: Create required directories - file: 'path={{item}} state=directory mode=0775 owner=1000 group=1000' - with_items: - - /opt/appdata/nextcloud - - /opt/appdata/nextcloud/conf - - /opt/appdata/nextcloud/data - - /mnt/unionfs/nextcloud - # LABELS ###################################################################### - name: 'Adding Traefik' set_fact: diff --git a/apps/nowshowing.yml b/apps/nowshowing.yml index 75f41a0..e22075d 100644 --- a/apps/nowshowing.yml +++ b/apps/nowshowing.yml @@ -28,7 +28,6 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' - name: 'Setting PG Volumes' diff --git a/apps/radarr4k.yml b/apps/radarr4k.yml index bf994b6..9d1265f 100644 --- a/apps/radarr4k.yml +++ b/apps/radarr4k.yml @@ -21,34 +21,6 @@ - name: 'Including cron job' include_tasks: '/opt/plexguide/containers/_core.yml' - # EXTRA FUNCTIONS REQUIRED BY THE ROLE ##################################### - - - name: 'Create scripts directory for {{pgrole}}' - file: - path: /opt/appdata/{{pgrole}}/scripts - state: directory - owner: 1000 - group: 1000 - mode: 0755 - - - name: 'Create plugins directory for {{pgrole}}' - file: - path: /opt/appdata/{{pgrole}}/plugins - state: directory - owner: 1000 - group: 1000 - mode: 0755 - - - name: 'Copy scripts into directory for {{pgrole}}' - copy: - src: /opt/plexguide/containers/templates/radarr/scripts/cleanup-radarr.sh - dest: /opt/appdata/{{pgrole}}/scripts - directory_mode: yes - force: yes - owner: 1000 - group: 1000 - mode: 0755 - # LABELS #### KEEPS BOTTOM CLEAN ########################################### - name: 'Adding Traefik' set_fact: diff --git a/apps/radarrhdr.yml b/apps/radarrhdr.yml index bdb02cd..e5d509e 100644 --- a/apps/radarrhdr.yml +++ b/apps/radarrhdr.yml @@ -21,34 +21,6 @@ - name: 'Including cron job' include_tasks: '/opt/plexguide/containers/_core.yml' - # EXTRA FUNCTIONS REQUIRED BY THE ROLE ##################################### - - - name: 'Create scripts directory for {{pgrole}}' - file: - path: /opt/appdata/{{pgrole}}/scripts - state: directory - owner: 1000 - group: 1000 - mode: 0755 - - - name: 'Create plugins directory for {{pgrole}}' - file: - path: /opt/appdata/{{pgrole}}/plugins - state: directory - owner: 1000 - group: 1000 - mode: 0755 - - - name: 'Copy scripts into directory for {{pgrole}}' - copy: - src: /opt/plexguide/containers/templates/radarr/scripts/cleanup-radarr.sh - dest: /opt/appdata/{{pgrole}}/scripts - directory_mode: yes - force: yes - owner: 1000 - group: 1000 - mode: 0755 - # LABELS #### KEEPS BOTTOM CLEAN ########################################### - name: 'Adding Traefik' set_fact: diff --git a/apps/sonarr4k.yml b/apps/sonarr4k.yml index 0f87a1f..b5707c8 100644 --- a/apps/sonarr4k.yml +++ b/apps/sonarr4k.yml @@ -22,34 +22,6 @@ - name: 'Including cron job' include_tasks: '/opt/plexguide/containers/_core.yml' - # EXTRA FUNCTIONS REQUIRED BY THE ROLE ##################################### - - - name: 'Create scripts directory for {{pgrole}}' - file: - path: /opt/appdata/{{pgrole}}/scripts - state: directory - owner: 1000 - group: 1000 - mode: 0755 - - - name: 'Create plugins directory for {{pgrole}}' - file: - path: /opt/appdata/{{pgrole}}/plugins - state: directory - owner: 1000 - group: 1000 - mode: 0755 - - - name: 'Copy scripts into directory for {{pgrole}}' - copy: - src: /opt/plexguide/containers/templates/sonarr/scripts/cleanup-sonarr.sh - dest: /opt/appdata/{{pgrole}}/scripts - directory_mode: yes - force: yes - owner: 1000 - group: 1000 - mode: 0755 - # LABELS #### KEEPS BOTTOM CLEAN ########################################### - name: 'Adding Traefik' set_fact: diff --git a/apps/sonarrhdr.yml b/apps/sonarrhdr.yml index cc7c0e6..1f8887c 100644 --- a/apps/sonarrhdr.yml +++ b/apps/sonarrhdr.yml @@ -22,34 +22,6 @@ - name: 'Including cron job' include_tasks: '/opt/plexguide/containers/_core.yml' - # EXTRA FUNCTIONS REQUIRED BY THE ROLE ##################################### - - - name: 'Create scripts directory for {{pgrole}}' - file: - path: /opt/appdata/{{pgrole}}/scripts - state: directory - owner: 1000 - group: 1000 - mode: 0755 - - - name: 'Create plugins directory for {{pgrole}}' - file: - path: /opt/appdata/{{pgrole}}/plugins - state: directory - owner: 1000 - group: 1000 - mode: 0755 - - - name: 'Copy scripts into directory for {{pgrole}}' - copy: - src: /opt/plexguide/containers/templates/sonarr/scripts/cleanup-sonarr.sh - dest: /opt/appdata/{{pgrole}}/scripts - directory_mode: yes - force: yes - owner: 1000 - group: 1000 - mode: 0755 - # LABELS #### KEEPS BOTTOM CLEAN ########################################### - name: 'Adding Traefik' set_fact: diff --git a/apps/syncthing.yml b/apps/syncthing.yml index a171e00..f1e03e5 100644 --- a/apps/syncthing.yml +++ b/apps/syncthing.yml @@ -48,7 +48,7 @@ - '/opt/appdata/{{pgrole}}/config:/config' - '/opt/appdata/{{pgrole}}/sync:/sync' - '/mnt:/mnt' - + - '{{path.stdout}}:{{path.stdout}}' - name: 'Setting PG ENV' set_fact: diff --git a/apps/ubooquity.yml b/apps/ubooquity.yml index af9e85f..19e0b41 100644 --- a/apps/ubooquity.yml +++ b/apps/ubooquity.yml @@ -28,7 +28,6 @@ traefik.frontend.auth.forward.address: '{{gauth}}' traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' - name: 'Setting PG Volumes'