From 2fd29aa92b745e6fb6859905da5015494d86c5b2 Mon Sep 17 00:00:00 2001 From: designgears Date: Thu, 21 Feb 2019 04:06:47 -0700 Subject: [PATCH 1/6] Update synclounge.yml Fix config to auto join the server it creates, fix domain so invites work properly --- apps/synclounge.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/synclounge.yml b/apps/synclounge.yml index 4fb0ac9..733c3a5 100644 --- a/apps/synclounge.yml +++ b/apps/synclounge.yml @@ -48,6 +48,11 @@ pg_env: UID: 1000 GID: 1000 + DOMAIN: {{pgrole}}.{{domain.stdout}} + autoJoin: true + autoJoinServer: {{pgrole}}.{{domain.stdout}} + serverroot: slserver + webroot: slweb # MAIN DEPLOYMENT ############################################################# - name: 'Deploying {{pgrole}}' From 0bc39766ca1504c5ee655fdb61d6bcb0b1b37028 Mon Sep 17 00:00:00 2001 From: designgears Date: Thu, 21 Feb 2019 06:10:11 -0700 Subject: [PATCH 2/6] Update synclounge.yml I guess the autojoin stuff doesn't work right, removed it --- apps/synclounge.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/synclounge.yml b/apps/synclounge.yml index 733c3a5..c450d36 100644 --- a/apps/synclounge.yml +++ b/apps/synclounge.yml @@ -49,10 +49,6 @@ UID: 1000 GID: 1000 DOMAIN: {{pgrole}}.{{domain.stdout}} - autoJoin: true - autoJoinServer: {{pgrole}}.{{domain.stdout}} - serverroot: slserver - webroot: slweb # MAIN DEPLOYMENT ############################################################# - name: 'Deploying {{pgrole}}' From f3754612f6eb8705c2834d12139999e4c4c284fc Mon Sep 17 00:00:00 2001 From: Robert Baker Date: Sat, 23 Feb 2019 12:58:55 -0700 Subject: [PATCH 3/6] fixes --- apps/handbrake2.yml | 2 +- apps/headphones.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/handbrake2.yml b/apps/handbrake2.yml index aa8e277..04d555b 100644 --- a/apps/handbrake2.yml +++ b/apps/handbrake2.yml @@ -28,7 +28,7 @@ pg_labels: traefik.enable: 'true' traefik.port: '{{intport}}' - traefik.frontend.auth.basic: "plex:$apr1$tosnCNtX$XKXnDaIiW7f0y1nwmd.KL0" + traefik.frontend.auth.basic.users: "plex:$apr1$tosnCNtX$XKXnDaIiW7f0y1nwmd.KL0" traefik.frontend.rule: 'Host:handbrake.{{domain.stdout}},{{tldset}}' - name: 'Setting PG Volumes' diff --git a/apps/headphones.yml b/apps/headphones.yml index 866a981..44bae46 100644 --- a/apps/headphones.yml +++ b/apps/headphones.yml @@ -34,7 +34,7 @@ set_fact: pg_volumes: - '/etc/localtime:/etc/localtime:ro' - - '/opt/appdata/pgrole:/config' + - '/opt/appdata/{{pgrole}}:/config' - '{{path.stdout}}:{{path.stdout}}' - '/mnt:/mnt' From 7fc787941510c032c7443ce95ebf9ab031d9c100 Mon Sep 17 00:00:00 2001 From: Admin9705 <24727006+Admin9705@users.noreply.github.com> Date: Sun, 24 Feb 2019 18:08:02 -0500 Subject: [PATCH 4/6] Update _core.yml --- apps/_core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/_core.yml b/apps/_core.yml index c21e982..3051063 100644 --- a/apps/_core.yml +++ b/apps/_core.yml @@ -113,7 +113,7 @@ # FOR AUTHENTICATION - name: 'Script Execute Part I' - shell: 'bash /opt/plexguide/menu/pgshield/drop.sh' + shell: 'bash /opt/pgshield/drop.sh' - name: 'Script Execute Part II' shell: 'cat /var/plexguide/auth.var' From 2cc70ade43dc2e2b0353d7b75d8b807619f74164 Mon Sep 17 00:00:00 2001 From: Admin9705 <24727006+Admin9705@users.noreply.github.com> Date: Sun, 24 Feb 2019 18:29:59 -0500 Subject: [PATCH 5/6] restore --- apps/_core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/_core.yml b/apps/_core.yml index 3051063..51fcb4a 100644 --- a/apps/_core.yml +++ b/apps/_core.yml @@ -113,7 +113,7 @@ # FOR AUTHENTICATION - name: 'Script Execute Part I' - shell: 'bash /opt/pgshield/drop.sh' + shell: 'bash /opt/pgshield/menu/pgshield/drop.sh' - name: 'Script Execute Part II' shell: 'cat /var/plexguide/auth.var' From f87fd636538e789df29a2312a3070c8873dce175 Mon Sep 17 00:00:00 2001 From: MrDoobPG <46342172+MrDoobPG@users.noreply.github.com> Date: Wed, 27 Feb 2019 16:19:57 +0100 Subject: [PATCH 6/6] upload dockergc moved from Core to Community-Apps Fix paths included --- apps/dockergc.yml | 64 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 apps/dockergc.yml diff --git a/apps/dockergc.yml b/apps/dockergc.yml new file mode 100644 index 0000000..b8a1ed6 --- /dev/null +++ b/apps/dockergc.yml @@ -0,0 +1,64 @@ +#!/bin/bash +# +# Title: PlexGuide (Reference Title File) +# Author(s): Admin9705 +# URL: https://plexguide.com - http://github.plexguide.com +# GNU: General Public License v3.0 +################################################################################ +--- +- hosts: localhost + gather_facts: false + tasks: + # FACTS ####################################################################### + - name: 'Set Known Facts' + set_fact: + pgrole: 'dockergc' + intport: '1' + extport: '1' + image: 'clockworksoul/docker-gc-cron' + + # CORE (MANDATORY) ############################################################ + - name: 'Including cron job' + include_tasks: '/opt/communityapps/apps/_core.yml' + + # MANDATORY DOCKERGC ########################################################## + - name: Install docker-gc-exclude + template: + src: /opt/communityapps/apps/templates/docker-gc-exclude + dest: /opt/appdata/{{pgrole}}/docker-gc-exclude + force: yes + mode: 0775 + owner: '1000' + group: '1000' + + # LABELS ###################################################################### + - name: 'Setting PG Volumes' + set_fact: + pg_volumes: + - /opt/appdata/dockergc/docker-gc-exclude:/etc/docker-gc-exclude + - /var/run/docker.sock:/var/run/docker.sock + - /etc/localtime:/etc/localtime:ro + + - name: 'Setting PG ENV' + set_fact: + pg_env: + PUID: '1000' + PGID: '1000' + CLEAN_UP_VOLUMES: 1 + + # 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: + - '{{pgrole}}' + state: started + labels: + traefik.enabled: 'false'