From 0e5e3cca90d4a63b48134aa5329002ef6a66441a Mon Sep 17 00:00:00 2001 From: sneedster Date: Sat, 12 Jan 2019 11:13:01 -0800 Subject: [PATCH 01/14] create delugevpn.yml I'm not sure how to code it to ask for vars like username and password for vpn, but I figure I can change those from within portainer. --- apps/delugevpn.yml | 293 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 293 insertions(+) create mode 100644 apps/delugevpn.yml diff --git a/apps/delugevpn.yml b/apps/delugevpn.yml new file mode 100644 index 0000000..bbeadeb --- /dev/null +++ b/apps/delugevpn.yml @@ -0,0 +1,293 @@ +#!/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: 'deluge' + intport: '8112' + extport: '8112' + intport2: '58846' + extport2: '58846' + intport3: '58946' + extport3: '58946' + intport4: '8118' + extport4: '8118' + image: 'binhex/arch-delugevpn' + + # CORE (MANDATORY) ############################################################ + - name: 'Including cron job' + include_tasks: '/opt/plexguide/containers/_core.yml' + + # FOLDER CREATION ############################################################# + - name: 'Including folders' + include_tasks: '/opt/plexguide/containers/_folders.yml' + + - name: 'Checking for existing app data' + stat: + path: /opt/appdata/{{pgrole}}/core.conf + register: confcheck + + # LABELS ###################################################################### + - name: 'Adding Traefik' + set_fact: + pg_labels: + traefik.frontend.auth.forward.address: '{{gauth}}' + traefik.enable: 'true' + traefik.port: '{{intport}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + + - name: 'Setting PG Volumes' + set_fact: + pg_volumes: + - '/opt/appdata/{{pgrole}}:/config' + - '{{path.stdout}}:{{path.stdout}}' + - '/etc/localtime:/etc/localtime:ro' + - '/mnt:/mnt' + + - name: 'Setting PG ENV' + set_fact: + pg_env: + PUID: 1000 + PGID: 1000 + VPN_ENABLED: yes + VPN_USER: vpnuser + VPN_PASS: vpnpass + VPN_PROV: vpnprov + ENABLE_PRIVOXY: no + STRICT_PORT_FORWARD: no + LAN_NETWORK: 192.168.1.1/24 + + # MAIN DEPLOYMENT ############################################################# + - name: 'Deploying {{pgrole}}' + docker_container: + name: '{{pgrole}}' + image: '{{image}}' + pull: yes + published_ports: + - '{{ports.stdout}}{{extport}}:{{intport}}' + - '{{ports.stdout}}{{extport2}}:{{intport2}}' + - '{{ports.stdout}}{{extport3}}:{{intport3}}' + - '{{ports.stdout}}{{extport4}}:{{intport4}}' + volumes: '{{pg_volumes}}' + env: '{{pg_env}}' + restart_policy: unless-stopped + networks: + - name: plexguide + aliases: + - '{{pgrole}}' + state: started + labels: '{{pg_labels}}' + + # CONFIGURATION ########################################################### + - name: 'Waiting for {{pgrole}} to initialize' + wait_for: + timeout: 10 + + - name: Stopping {{pgrole}} + docker_container: + name: '{{pgrole}}' + state: stopped + + - name: 'Checking for appdata' + wait_for: + path: '/opt/appdata/{{pgrole}}/core.conf' + state: present + + - name: Setting plugins directory + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"plugins_location".*' + line: '"plugins_location": "/config/plugins",' + state: present + + - name: Set download location + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"download_location".*' + line: '"download_location": "{{path.stdout}}/downloads/{{pgrole}}",' + state: present + when: incomplete.stdout | length == 0 + + - name: Set incomplete path + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"download_location".*' + line: '"download_location": "{{path.stdout}}/incomplete/{{pgrole}}",' + state: present + when: incomplete.stdout | length > 0 + + - name: Setting complete downloads directory + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"move_completed_path".*' + line: '"move_completed_path": "{{path.stdout}}/downloads/{{pgrole}}",' + state: present + when: incomplete.stdout | length > 0 + + - name: Setting torrent file directory + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"torrentfiles_location".*' + line: '"torrentfiles_location": "{{path.stdout}}/torrent",' + state: present + + - name: Setting torrent watch directory + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"autoadd_location".*' + line: '"autoadd_location": "{{path.stdout}}/torrent/watch",' + state: present + + - name: Setting move_completed when incomplete is undefined + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"move_completed".*' + line: '"move_completed": false,' + state: present + when: incomplete.stdout | length == 0 + + - name: Setting move_completed when incomplete is defined + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"move_completed".*' + line: '"move_completed": true,' + state: present + when: incomplete.stdout | length > 0 + + - name: Setting extractor folder + lineinfile: + path: '/opt/appdata/{{pgrole}}/plugins/extractor.conf' + regexp: '"use_name_folder".*' + line: '"use_name_folder": true,' + state: present + + - name: Setting extractor + lineinfile: + path: '/opt/appdata/{{pgrole}}/plugins/extractor.conf' + regexp: '"extract_path".*' + line: '"extract_path": "{{path.stdout}}/downloads/deluge"' + state: present + + - name: set enabled_plugins + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enabled_plugins".*' + line: '"enabled_plugins": ["Extractor", "Label"],' + state: present + + # FIRST TIME CONFIGURATION #################################################### + - name: 'Configuring {{pgrole}} for first time use' + block: + - name: set compact_allocation + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"compact_allocation".*' + line: '"compact_allocation": true,' + state: present + + - name: set stop_seed_ratio + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"stop_seed_ratio"".*' + line: '"stop_seed_ratio": 1.0,' + state: present + + - name: set share_ratio_limit + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"share_ratio_limit".*' + line: '"share_ratio_limit": 1.0,' + state: present + + - name: set remove_seed_at_ratio + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"remove_seed_at_ratio".*' + line: '"remove_seed_at_ratio": true,' + state: present + + - name: set enc_prefer_rc4 + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enc_prefer_rc4".*' + line: '"enc_prefer_rc4": true,' + state: present + + - name: set enc_level + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enc_level".*' + line: '"enc_level": 1,' + state: present + + - name: set enc_in_policy + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enc_in_policy".*' + line: '"enc_in_policy": 1,' + state: present + + - name: set enc_out_policy + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enc_out_policy".*' + line: '"enc_out_policy": 1,' + state: present + + - name: set max_active_downloading + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"max_active_downloading".*' + line: '"max_active_downloading": 4,' + state: present + + - name: set dont_count_slow_torrents + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"dont_count_slow_torrents".*' + line: '"dont_count_slow_torrents": true,' + state: present + + - name: set max_active_seeding + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enabled_plugins".*' + line: '"max_active_seeding": 8,' + state: present + + - name: set share_ratio_limit + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"share_ratio_limit".*' + line: '"share_ratio_limit": 1,' + state: present + + - name: set stop_seed_at_ratio + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"stop_seed_at_ratio".*' + line: '"stop_seed_at_ratio": 1.0,' + state: present + + - name: set seed_time_ratio_limit + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"seed_time_ratio_limit".*' + line: '"seed_time_ratio_limit": 1.0,' + state: present + + #when: not confcheck.stat.exists + + - name: Restart {{pgrole}} + docker_container: + name: '{{pgrole}}' + state: started From fe6561255f391d2862c7053012d648113d9f58c0 Mon Sep 17 00:00:00 2001 From: Admin9705 Date: Sun, 13 Jan 2019 01:17:30 -0500 Subject: [PATCH 02/14] update --- .DS_Store | Bin 6148 -> 6148 bytes .gitignore | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.DS_Store b/.DS_Store index f43dce6cb449996b946e903f6e9c3e41ee386953..512932864056adf4d3cce77f3c376fc3d2ed10ee 100644 GIT binary patch delta 14 VcmZoMXffEZl8Mn^^D3q&Q2-|N1j7IT delta 14 VcmZoMXffEZl8Mo9^D3q&Q2-|T1jGOU diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9bea433 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.DS_Store From 1c1f9559ebaf74e74d843a49d5818f7506a1fc5e Mon Sep 17 00:00:00 2001 From: Admin9705 Date: Sun, 13 Jan 2019 01:28:19 -0500 Subject: [PATCH 03/14] Revert "Merge pull request #2 from TechButton/patch-1" This reverts commit 5f1aa8cff09054e6dcb07e9a05676cc35859735b, reversing changes made to b1e8576bec0e1b4debb54daf844fc22ac2159a8e. --- apps/xteve.yml | 67 -------------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 apps/xteve.yml diff --git a/apps/xteve.yml b/apps/xteve.yml deleted file mode 100644 index 94e3745..0000000 --- a/apps/xteve.yml +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# -# Title: PlexGuide (Reference Title File) -# Author(s): TechButton -# 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: 'xteve' - intport: '32768' - extport: '34400' - image: 'crobibero/xteve' - - # CORE (MANDATORY) ############################################################ - - name: 'Including cron job' - include_tasks: '/opt/plexguide/containers/_core.yml' - - # LABELS ###################################################################### - - - name: 'Adding Traefik' - set_fact: - pg_labels: - traefik.enable: 'true' - traefik.port: '{{intport}}' - traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' - - - name: 'Setting PG Volumes' - set_fact: - pg_volumes: - - '/opt/appdata/{{pgrole}}:/home/xteve/xteve' - - '/opt/appdata/{{pgrole}}/temp:/temp/xteve' - - '{{path.stdout}}:{{path.stdout}}' - - '/etc/localtime:/etc/localtime:ro' - - '/mnt:/mnt' - - - name: 'Setting PG ENV' - set_fact: - pg_env: - PUID: 1000 - PGID: 1000 - - # MAIN DEPLOYMENT ############################################################# - - - name: 'Deploying {{pgrole}}' - docker_container: - name: '{{pgrole}}' - image: '{{image}}' - pull: yes - published_ports: - - '{{ports.stdout}}{{extport}}:{{intport}}' - volumes: '{{pg_volumes}}' - env: '{{pg_env}}' - restart_policy: unless-stopped - networks: - - name: plexguide - aliases: - - '{{pgrole}}' - state: started - labels: '{{pg_labels}}' From 645888cf165e054b3e2c7a74493c8b3b8c0f0c88 Mon Sep 17 00:00:00 2001 From: Admin9705 Date: Sun, 13 Jan 2019 01:29:18 -0500 Subject: [PATCH 04/14] Revert "Merge branch 'v8' of https://github.com/Admin9705/PlexGuide-Community into v8" This reverts commit 1dccce245076ba2d12731a3b3876d845cf1253dc, reversing changes made to 1c1f9559ebaf74e74d843a49d5818f7506a1fc5e. --- apps/delugevpn.yml | 293 --------------------------------------------- 1 file changed, 293 deletions(-) delete mode 100644 apps/delugevpn.yml diff --git a/apps/delugevpn.yml b/apps/delugevpn.yml deleted file mode 100644 index bbeadeb..0000000 --- a/apps/delugevpn.yml +++ /dev/null @@ -1,293 +0,0 @@ -#!/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: 'deluge' - intport: '8112' - extport: '8112' - intport2: '58846' - extport2: '58846' - intport3: '58946' - extport3: '58946' - intport4: '8118' - extport4: '8118' - image: 'binhex/arch-delugevpn' - - # CORE (MANDATORY) ############################################################ - - name: 'Including cron job' - include_tasks: '/opt/plexguide/containers/_core.yml' - - # FOLDER CREATION ############################################################# - - name: 'Including folders' - include_tasks: '/opt/plexguide/containers/_folders.yml' - - - name: 'Checking for existing app data' - stat: - path: /opt/appdata/{{pgrole}}/core.conf - register: confcheck - - # LABELS ###################################################################### - - name: 'Adding Traefik' - set_fact: - pg_labels: - traefik.frontend.auth.forward.address: '{{gauth}}' - traefik.enable: 'true' - traefik.port: '{{intport}}' - traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' - - - name: 'Setting PG Volumes' - set_fact: - pg_volumes: - - '/opt/appdata/{{pgrole}}:/config' - - '{{path.stdout}}:{{path.stdout}}' - - '/etc/localtime:/etc/localtime:ro' - - '/mnt:/mnt' - - - name: 'Setting PG ENV' - set_fact: - pg_env: - PUID: 1000 - PGID: 1000 - VPN_ENABLED: yes - VPN_USER: vpnuser - VPN_PASS: vpnpass - VPN_PROV: vpnprov - ENABLE_PRIVOXY: no - STRICT_PORT_FORWARD: no - LAN_NETWORK: 192.168.1.1/24 - - # MAIN DEPLOYMENT ############################################################# - - name: 'Deploying {{pgrole}}' - docker_container: - name: '{{pgrole}}' - image: '{{image}}' - pull: yes - published_ports: - - '{{ports.stdout}}{{extport}}:{{intport}}' - - '{{ports.stdout}}{{extport2}}:{{intport2}}' - - '{{ports.stdout}}{{extport3}}:{{intport3}}' - - '{{ports.stdout}}{{extport4}}:{{intport4}}' - volumes: '{{pg_volumes}}' - env: '{{pg_env}}' - restart_policy: unless-stopped - networks: - - name: plexguide - aliases: - - '{{pgrole}}' - state: started - labels: '{{pg_labels}}' - - # CONFIGURATION ########################################################### - - name: 'Waiting for {{pgrole}} to initialize' - wait_for: - timeout: 10 - - - name: Stopping {{pgrole}} - docker_container: - name: '{{pgrole}}' - state: stopped - - - name: 'Checking for appdata' - wait_for: - path: '/opt/appdata/{{pgrole}}/core.conf' - state: present - - - name: Setting plugins directory - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"plugins_location".*' - line: '"plugins_location": "/config/plugins",' - state: present - - - name: Set download location - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"download_location".*' - line: '"download_location": "{{path.stdout}}/downloads/{{pgrole}}",' - state: present - when: incomplete.stdout | length == 0 - - - name: Set incomplete path - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"download_location".*' - line: '"download_location": "{{path.stdout}}/incomplete/{{pgrole}}",' - state: present - when: incomplete.stdout | length > 0 - - - name: Setting complete downloads directory - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"move_completed_path".*' - line: '"move_completed_path": "{{path.stdout}}/downloads/{{pgrole}}",' - state: present - when: incomplete.stdout | length > 0 - - - name: Setting torrent file directory - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"torrentfiles_location".*' - line: '"torrentfiles_location": "{{path.stdout}}/torrent",' - state: present - - - name: Setting torrent watch directory - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"autoadd_location".*' - line: '"autoadd_location": "{{path.stdout}}/torrent/watch",' - state: present - - - name: Setting move_completed when incomplete is undefined - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"move_completed".*' - line: '"move_completed": false,' - state: present - when: incomplete.stdout | length == 0 - - - name: Setting move_completed when incomplete is defined - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"move_completed".*' - line: '"move_completed": true,' - state: present - when: incomplete.stdout | length > 0 - - - name: Setting extractor folder - lineinfile: - path: '/opt/appdata/{{pgrole}}/plugins/extractor.conf' - regexp: '"use_name_folder".*' - line: '"use_name_folder": true,' - state: present - - - name: Setting extractor - lineinfile: - path: '/opt/appdata/{{pgrole}}/plugins/extractor.conf' - regexp: '"extract_path".*' - line: '"extract_path": "{{path.stdout}}/downloads/deluge"' - state: present - - - name: set enabled_plugins - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"enabled_plugins".*' - line: '"enabled_plugins": ["Extractor", "Label"],' - state: present - - # FIRST TIME CONFIGURATION #################################################### - - name: 'Configuring {{pgrole}} for first time use' - block: - - name: set compact_allocation - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"compact_allocation".*' - line: '"compact_allocation": true,' - state: present - - - name: set stop_seed_ratio - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"stop_seed_ratio"".*' - line: '"stop_seed_ratio": 1.0,' - state: present - - - name: set share_ratio_limit - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"share_ratio_limit".*' - line: '"share_ratio_limit": 1.0,' - state: present - - - name: set remove_seed_at_ratio - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"remove_seed_at_ratio".*' - line: '"remove_seed_at_ratio": true,' - state: present - - - name: set enc_prefer_rc4 - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"enc_prefer_rc4".*' - line: '"enc_prefer_rc4": true,' - state: present - - - name: set enc_level - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"enc_level".*' - line: '"enc_level": 1,' - state: present - - - name: set enc_in_policy - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"enc_in_policy".*' - line: '"enc_in_policy": 1,' - state: present - - - name: set enc_out_policy - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"enc_out_policy".*' - line: '"enc_out_policy": 1,' - state: present - - - name: set max_active_downloading - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"max_active_downloading".*' - line: '"max_active_downloading": 4,' - state: present - - - name: set dont_count_slow_torrents - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"dont_count_slow_torrents".*' - line: '"dont_count_slow_torrents": true,' - state: present - - - name: set max_active_seeding - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"enabled_plugins".*' - line: '"max_active_seeding": 8,' - state: present - - - name: set share_ratio_limit - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"share_ratio_limit".*' - line: '"share_ratio_limit": 1,' - state: present - - - name: set stop_seed_at_ratio - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"stop_seed_at_ratio".*' - line: '"stop_seed_at_ratio": 1.0,' - state: present - - - name: set seed_time_ratio_limit - lineinfile: - path: '/opt/appdata/{{pgrole}}/core.conf' - regexp: '"seed_time_ratio_limit".*' - line: '"seed_time_ratio_limit": 1.0,' - state: present - - #when: not confcheck.stat.exists - - - name: Restart {{pgrole}} - docker_container: - name: '{{pgrole}}' - state: started From af2e0aeca0390148e653018a028c309eb397e63b Mon Sep 17 00:00:00 2001 From: Admin9705 Date: Sun, 13 Jan 2019 01:29:54 -0500 Subject: [PATCH 05/14] Revert "Revert "Merge branch 'v8' of https://github.com/Admin9705/PlexGuide-Community into v8"" This reverts commit 645888cf165e054b3e2c7a74493c8b3b8c0f0c88. --- apps/delugevpn.yml | 293 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 293 insertions(+) create mode 100644 apps/delugevpn.yml diff --git a/apps/delugevpn.yml b/apps/delugevpn.yml new file mode 100644 index 0000000..bbeadeb --- /dev/null +++ b/apps/delugevpn.yml @@ -0,0 +1,293 @@ +#!/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: 'deluge' + intport: '8112' + extport: '8112' + intport2: '58846' + extport2: '58846' + intport3: '58946' + extport3: '58946' + intport4: '8118' + extport4: '8118' + image: 'binhex/arch-delugevpn' + + # CORE (MANDATORY) ############################################################ + - name: 'Including cron job' + include_tasks: '/opt/plexguide/containers/_core.yml' + + # FOLDER CREATION ############################################################# + - name: 'Including folders' + include_tasks: '/opt/plexguide/containers/_folders.yml' + + - name: 'Checking for existing app data' + stat: + path: /opt/appdata/{{pgrole}}/core.conf + register: confcheck + + # LABELS ###################################################################### + - name: 'Adding Traefik' + set_fact: + pg_labels: + traefik.frontend.auth.forward.address: '{{gauth}}' + traefik.enable: 'true' + traefik.port: '{{intport}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + + - name: 'Setting PG Volumes' + set_fact: + pg_volumes: + - '/opt/appdata/{{pgrole}}:/config' + - '{{path.stdout}}:{{path.stdout}}' + - '/etc/localtime:/etc/localtime:ro' + - '/mnt:/mnt' + + - name: 'Setting PG ENV' + set_fact: + pg_env: + PUID: 1000 + PGID: 1000 + VPN_ENABLED: yes + VPN_USER: vpnuser + VPN_PASS: vpnpass + VPN_PROV: vpnprov + ENABLE_PRIVOXY: no + STRICT_PORT_FORWARD: no + LAN_NETWORK: 192.168.1.1/24 + + # MAIN DEPLOYMENT ############################################################# + - name: 'Deploying {{pgrole}}' + docker_container: + name: '{{pgrole}}' + image: '{{image}}' + pull: yes + published_ports: + - '{{ports.stdout}}{{extport}}:{{intport}}' + - '{{ports.stdout}}{{extport2}}:{{intport2}}' + - '{{ports.stdout}}{{extport3}}:{{intport3}}' + - '{{ports.stdout}}{{extport4}}:{{intport4}}' + volumes: '{{pg_volumes}}' + env: '{{pg_env}}' + restart_policy: unless-stopped + networks: + - name: plexguide + aliases: + - '{{pgrole}}' + state: started + labels: '{{pg_labels}}' + + # CONFIGURATION ########################################################### + - name: 'Waiting for {{pgrole}} to initialize' + wait_for: + timeout: 10 + + - name: Stopping {{pgrole}} + docker_container: + name: '{{pgrole}}' + state: stopped + + - name: 'Checking for appdata' + wait_for: + path: '/opt/appdata/{{pgrole}}/core.conf' + state: present + + - name: Setting plugins directory + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"plugins_location".*' + line: '"plugins_location": "/config/plugins",' + state: present + + - name: Set download location + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"download_location".*' + line: '"download_location": "{{path.stdout}}/downloads/{{pgrole}}",' + state: present + when: incomplete.stdout | length == 0 + + - name: Set incomplete path + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"download_location".*' + line: '"download_location": "{{path.stdout}}/incomplete/{{pgrole}}",' + state: present + when: incomplete.stdout | length > 0 + + - name: Setting complete downloads directory + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"move_completed_path".*' + line: '"move_completed_path": "{{path.stdout}}/downloads/{{pgrole}}",' + state: present + when: incomplete.stdout | length > 0 + + - name: Setting torrent file directory + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"torrentfiles_location".*' + line: '"torrentfiles_location": "{{path.stdout}}/torrent",' + state: present + + - name: Setting torrent watch directory + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"autoadd_location".*' + line: '"autoadd_location": "{{path.stdout}}/torrent/watch",' + state: present + + - name: Setting move_completed when incomplete is undefined + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"move_completed".*' + line: '"move_completed": false,' + state: present + when: incomplete.stdout | length == 0 + + - name: Setting move_completed when incomplete is defined + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"move_completed".*' + line: '"move_completed": true,' + state: present + when: incomplete.stdout | length > 0 + + - name: Setting extractor folder + lineinfile: + path: '/opt/appdata/{{pgrole}}/plugins/extractor.conf' + regexp: '"use_name_folder".*' + line: '"use_name_folder": true,' + state: present + + - name: Setting extractor + lineinfile: + path: '/opt/appdata/{{pgrole}}/plugins/extractor.conf' + regexp: '"extract_path".*' + line: '"extract_path": "{{path.stdout}}/downloads/deluge"' + state: present + + - name: set enabled_plugins + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enabled_plugins".*' + line: '"enabled_plugins": ["Extractor", "Label"],' + state: present + + # FIRST TIME CONFIGURATION #################################################### + - name: 'Configuring {{pgrole}} for first time use' + block: + - name: set compact_allocation + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"compact_allocation".*' + line: '"compact_allocation": true,' + state: present + + - name: set stop_seed_ratio + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"stop_seed_ratio"".*' + line: '"stop_seed_ratio": 1.0,' + state: present + + - name: set share_ratio_limit + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"share_ratio_limit".*' + line: '"share_ratio_limit": 1.0,' + state: present + + - name: set remove_seed_at_ratio + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"remove_seed_at_ratio".*' + line: '"remove_seed_at_ratio": true,' + state: present + + - name: set enc_prefer_rc4 + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enc_prefer_rc4".*' + line: '"enc_prefer_rc4": true,' + state: present + + - name: set enc_level + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enc_level".*' + line: '"enc_level": 1,' + state: present + + - name: set enc_in_policy + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enc_in_policy".*' + line: '"enc_in_policy": 1,' + state: present + + - name: set enc_out_policy + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enc_out_policy".*' + line: '"enc_out_policy": 1,' + state: present + + - name: set max_active_downloading + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"max_active_downloading".*' + line: '"max_active_downloading": 4,' + state: present + + - name: set dont_count_slow_torrents + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"dont_count_slow_torrents".*' + line: '"dont_count_slow_torrents": true,' + state: present + + - name: set max_active_seeding + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"enabled_plugins".*' + line: '"max_active_seeding": 8,' + state: present + + - name: set share_ratio_limit + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"share_ratio_limit".*' + line: '"share_ratio_limit": 1,' + state: present + + - name: set stop_seed_at_ratio + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"stop_seed_at_ratio".*' + line: '"stop_seed_at_ratio": 1.0,' + state: present + + - name: set seed_time_ratio_limit + lineinfile: + path: '/opt/appdata/{{pgrole}}/core.conf' + regexp: '"seed_time_ratio_limit".*' + line: '"seed_time_ratio_limit": 1.0,' + state: present + + #when: not confcheck.stat.exists + + - name: Restart {{pgrole}} + docker_container: + name: '{{pgrole}}' + state: started From 033b1ff0f2486929026742c1b76208d55d10301e Mon Sep 17 00:00:00 2001 From: timekills Date: Sun, 13 Jan 2019 22:50:07 +0430 Subject: [PATCH 06/14] Handbrake oAuth (web interface) # handbrake-for-plexguide Handbrake through web interface for PlexGuide deployment with Traefik integration and Google OAuth security Includes Imultiple automatic presets based on folder. # Automated folder Usage: Add to /mnt/handbrake/watch/Very_Fast_1080p30 folder for automatic 1080p AAC 2.0 MP4 (Very Fast) Add to /mnt/handbrake/watch/HQ_1080p30_Surround folder for automatic HQ 1080p 5,1 MP4 (Slow) Add to /mnt/handbrake/1080mkv folder for automatic 1080p AAC 2.0 MKV (Standard) --- apps/handbrake | 139 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 apps/handbrake diff --git a/apps/handbrake b/apps/handbrake new file mode 100644 index 0000000..239d61c --- /dev/null +++ b/apps/handbrake @@ -0,0 +1,139 @@ +#!/bin/bash +# +# Title: Handbrake for PlexGuide +# Author(s): timekills +# URL: https://plexguide.com - https://github.com/timekills +# GNU: General Public License v3.0 +################################################################################ +--- +- hosts: localhost + gather_facts: false + tasks: + # FACTS ####################################################################### + + - name: 'Set Known Facts' + set_fact: + pgrole: 'handbrake' + intport: '5800' + extport: '5800' + image: 'jlesage/handbrake:dev-latest' + + # CORE (MANDATORY) ############################################################ + - 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: 'Get home variable' + debug: homestorage=ansible_env.HOME + + # LABELS ###################################################################### + - name: 'Adding Traefik' + set_fact: + pg_labels: + traefik.enable: 'true' + traefik.port: '{{intport}}' + traefik.frontend.auth.forward.address: '{{gauth}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}'' + + - name: 'Setting PG Volumes' + set_fact: + pg_volumes: + - '/opt/appdata/{{pgrole}}/config:/config:rw' + - '/:/storage:ro' + - '{{path.stdout}}:{{path.stdout}}' + - '/mnt/unionfs:/mnt/unionfs' + - '{{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' + - '{{path.stdout}}/{{pgrole}}/complete/:/output:rw' + - '/dev/dri:/dev/dri:rw' + - '/etc/localtime:/etc/localtime:ro' + + - name: 'Setting PG ENV' + set_fact: + pg_env: + USER_ID: 1000 + GROUP_ID: 1000 + AUTOMATED_CONVERSION_PRESET: "Very Fast 1080p30" + AUTOMATED_CONVERSION_FORMAT: "mp4" + AUTOMATED_CONVERSION_PRESET_2: "HQ 1080p30 Surround" + AUTOMATED_CONVERSION_FORMAT_2: "mp4" + AUTOMATED_CONVERSION_PRESET_3: "H.264 MKV 1080p30" + AUTOMATED_CONVERSION_FORMAT_3: "mkv" +# SECURE_CONNECTION: 1 + + # MAIN DEPLOYMENT ############################################################# + - name: 'Create watch directory for {{pgrole}}' + file: + path: '{{path.stdout}}/handbrake/watch' + state: directory + owner: 1000 + group: 1000 + mode: 0755 + recurse: yes + + - name: 'Create complete directory for {{pgrole}}' + file: + path: '{{path.stdout}}/handbrake/complete' + state: directory + owner: 1000 + group: 1000 + mode: 0755 + recurse: yes + + - name: 'Deploying {{pgrole}}' + docker_container: + name: '{{pgrole}}' + image: '{{image}}' + pull: yes + published_ports: + - '{{ports.stdout}}{{extport}}:{{intport}}' + volumes: '{{pg_volumes}}' + env: '{{pg_env}}' + restart_policy: unless-stopped + networks: + - name: plexguide + aliases: + - '{{pgrole}}' + state: started + labels: '{{pg_labels}}' + + - name: 'Wait 6 Seconds' + wait_for: + timeout: 6 + + - name: Stop Container + docker_container: + name: '{{pgrole}}' + state: stopped + + # ENDING FOR HANDBRAKE ########################################################### + +# - name: 'Waiting for {{pgrole}} to initialize' +# wait_for: +# path: '/opt/appdata/{{pgrole}}/core.conf' +# state: present + + - name: 'Configuring {{pgrole}} for first time use' + block: + - name: 'Stopping {{pgrole}}' + docker_container: + name: '{{pgrole}}' + state: stopped + +# - name: Setting plugins directory +# lineinfile: +# path: '/opt/appdata/{{pgrole}}/core.conf' +# regexp: '"plugins_location"' +# line: '"plugins_location": "/config/plugins",' +# state: present + + - name: Restart Container + docker_container: + name: '{{pgrole}}' + state: started From 663342b2487ee2fc18aa6ba7770a2eb885a8834d Mon Sep 17 00:00:00 2001 From: timekills Date: Sun, 13 Jan 2019 22:52:13 +0430 Subject: [PATCH 07/14] Create jdownloader2.yml --- apps/jdownloader2.yml | 144 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 apps/jdownloader2.yml diff --git a/apps/jdownloader2.yml b/apps/jdownloader2.yml new file mode 100644 index 0000000..baa8db6 --- /dev/null +++ b/apps/jdownloader2.yml @@ -0,0 +1,144 @@ +#!/bin/bash +# +# Title: Jdownloader2 for PlexGuide (OAuth security) +# Author(s): timekills +# URL: https://plexguide.com - https://github.com/timekills/jdownloader2-for-Plexguide +# GNU: General Public License v3.0 +################################################################################ +--- +- hosts: localhost + gather_facts: false + tasks: + # FACTS ####################################################################### + + - name: 'Set Known Facts' + set_fact: + pgrole: 'jdownloader2' + intport: '5800' + extport: '5800' + intport2: '5902' + extport2: '5902' + intport3: '3129' + extport3: '3129' + image: 'jlesage/jdownloader-2' + + # CORE (MANDATORY) ############################################################ + - 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}}/incomplete/{{pgrole}}' + + - name: 'Chown download folder' + shell: 'chown -R 1000:1000 {{path.stdout}}/incomplete/{{pgrole}}/' + + - name: 'Chmod download folder' + shell: 'chmod -R 775 {{path.stdout}}/incomplete/{{pgrole}}/' + + - name: 'Ini Check' + stat: + path: /opt/appdata/{{pgrole}}/core.conf + register: inicheck + + # LABELS ###################################################################### + - name: 'Adding Traefik' + set_fact: + pg_labels: + traefik.enable: 'true' + traefik.port: '{{intport}}' + traefik.frontend.auth.forward.address: '{{gauth}}' + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + + - name: 'Setting PG Volumes' + set_fact: + pg_volumes: + - '/opt/appdata/{{pgrole}}:/config' + - '{{path.stdout}}:{{path.stdout}}' + - '/mnt/unionfs:/unionfs' + - '{{path.stdout}}/incomplete/{{pgrole}}/:/output:rw' + - '/etc/localtime:/etc/localtime:ro' + + - name: 'Setting PG ENV' + set_fact: + pg_env: + UID: 1000 + GID: 1000 + + # MAIN DEPLOYMENT ############################################################# + - 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: 'Deploying {{pgrole}}' + docker_container: + name: '{{pgrole}}' + image: '{{image}}' + pull: yes + published_ports: + - '{{ports.stdout}}{{extport}}:{{intport}}' + volumes: '{{pg_volumes}}' + env: '{{pg_env}}' + restart_policy: unless-stopped + networks: + - name: plexguide + aliases: + - '{{pgrole}}' + state: started + labels: '{{pg_labels}}' + + - name: 'Wait 6 Seconds' + wait_for: + timeout: 6 + + - name: Stop Container + docker_container: + name: '{{pgrole}}' + state: stopped + + # ENDING FOR JDOWNLOADER2 ########################################################### + +# - name: 'Waiting for {{pgrole}} to initialize' +# wait_for: +# path: '/opt/appdata/{{pgrole}}/core.conf' +# state: present + + - name: 'Configuring {{pgrole}} for first time use' + block: + - name: 'Stopping {{pgrole}}' + docker_container: + name: '{{pgrole}}' + state: stopped + +# - name: Setting plugins directory +# lineinfile: +# path: '/opt/appdata/{{pgrole}}/core.conf' +# regexp: '"plugins_location"' +# line: '"plugins_location": "/config/plugins",' +# state: present + + - name: Restart Container + docker_container: + name: '{{pgrole}}' + state: started + + when: not inicheck.stat.exists From 41a35e7f74ec41758991187eebec3e887c85edfa Mon Sep 17 00:00:00 2001 From: timekills Date: Sun, 13 Jan 2019 22:55:41 +0430 Subject: [PATCH 08/14] Create handbrake-password # handbrake-for-plexguide Handbrake through web interface or VNC for PlexGuide deployment with Traefik integration and username/password security Includes Intel QuickSync and multiple automatic presets based on folder. # Usage: Add to /mnt/handbrake/watch/Very_Fast_1080p30 folder for automatic 1080p AAC 2.0 MP4 (Very Fast) Add to /mnt/handbrake/watch/HQ_1080p30_Surround folder for automatic HQ 1080p 5,1 MP4 (Slow) Add to /mnt/handbrake/1080mkv folder for automatic 1080p AAC 2.0 MKV (Standard) # Username and password version (default username is plex and default password is guide) # If you want to change the username/password from default plex/guide 1. go to --> http://www.htaccesstools.com/htpasswd-generator/ and create username/password pair. It will give you the plaintext username and hashed password 2. (example username test and password test will give you test:$apr1$n22fgswn$4Wu4q/Dzc7ACcgiLaoU5d/) 3. Edit the /opt/mycontainers/handbrake.yml file (eg. sudo nano /opt/mycontainers/handbrake.yml ) 4. Replace the line traefik.frontend.auth.basic: "plex:$apr1$tosnCNtX$XKXnDaIiW7f0y1nwmd.KL0" with traefik.frontend.auth.basic: "yourNewUsername:YourNewHashedPassword." Example traefik.frontend.auth.basic: "test:$apr1$n22fgswn$4Wu4q/Dzc7ACcgiLaoU5d/" Go to plexguide and redeploy/reinstall handbrake --- apps/handbrake-password | 139 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 apps/handbrake-password diff --git a/apps/handbrake-password b/apps/handbrake-password new file mode 100644 index 0000000..6632b0f --- /dev/null +++ b/apps/handbrake-password @@ -0,0 +1,139 @@ +#!/bin/bash +# +# Title: Handbrake for PlexGuide +# Author(s): timekills +# URL: https://plexguide.com - https://github.com/timekills +# GNU: General Public License v3.0 +################################################################################ +--- +- hosts: localhost + gather_facts: false + tasks: + # FACTS ####################################################################### + + - name: 'Set Known Facts' + set_fact: + pgrole: 'handbrake' + intport: '5800' + extport: '5800' + image: 'jlesage/handbrake:dev-latest' + + # CORE (MANDATORY) ############################################################ + - 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: 'Get home variable' + debug: homestorage=ansible_env.HOME + + # LABELS ###################################################################### + - name: 'Adding Traefik' + set_fact: + pg_labels: + traefik.enable: 'true' + traefik.port: '{{intport}}' + traefik.frontend.auth.basic: "plex:$apr1$tosnCNtX$XKXnDaIiW7f0y1nwmd.KL0" + traefik.frontend.rule: 'Host:{{pgrole}}.{{domain.stdout}},{{tldset}}' + + - name: 'Setting PG Volumes' + set_fact: + pg_volumes: + - '/opt/appdata/{{pgrole}}/config:/config:rw' + - '/:/storage:ro' + - '{{path.stdout}}:{{path.stdout}}' + - '/mnt/unionfs:/mnt/unionfs' + - '{{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' + - '{{path.stdout}}/{{pgrole}}/complete/:/output:rw' + - '/dev/dri:/dev/dri:rw' + - '/etc/localtime:/etc/localtime:ro' + + - name: 'Setting PG ENV' + set_fact: + pg_env: + USER_ID: 1000 + GROUP_ID: 1000 + AUTOMATED_CONVERSION_PRESET: "Very Fast 1080p30" + AUTOMATED_CONVERSION_FORMAT: "mp4" + AUTOMATED_CONVERSION_PRESET_2: "HQ 1080p30 Surround" + AUTOMATED_CONVERSION_FORMAT_2: "mp4" + AUTOMATED_CONVERSION_PRESET_3: "H.264 MKV 1080p30" + AUTOMATED_CONVERSION_FORMAT_3: "mkv" +# SECURE_CONNECTION: 1 + + # MAIN DEPLOYMENT ############################################################# + - name: 'Create watch directory for {{pgrole}}' + file: + path: '{{path.stdout}}/handbrake/watch' + state: directory + owner: 1000 + group: 1000 + mode: 0755 + recurse: yes + + - name: 'Create complete directory for {{pgrole}}' + file: + path: '{{path.stdout}}/handbrake/complete' + state: directory + owner: 1000 + group: 1000 + mode: 0755 + recurse: yes + + - name: 'Deploying {{pgrole}}' + docker_container: + name: '{{pgrole}}' + image: '{{image}}' + pull: yes + published_ports: + - '{{ports.stdout}}{{extport}}:{{intport}}' + volumes: '{{pg_volumes}}' + env: '{{pg_env}}' + restart_policy: unless-stopped + networks: + - name: plexguide + aliases: + - '{{pgrole}}' + state: started + labels: '{{pg_labels}}' + + - name: 'Wait 6 Seconds' + wait_for: + timeout: 6 + + - name: Stop Container + docker_container: + name: '{{pgrole}}' + state: stopped + + # ENDING FOR HANDBRAKE ########################################################### + +# - name: 'Waiting for {{pgrole}} to initialize' +# wait_for: +# path: '/opt/appdata/{{pgrole}}/core.conf' +# state: present + + - name: 'Configuring {{pgrole}} for first time use' + block: + - name: 'Stopping {{pgrole}}' + docker_container: + name: '{{pgrole}}' + state: stopped + +# - name: Setting plugins directory +# lineinfile: +# path: '/opt/appdata/{{pgrole}}/core.conf' +# regexp: '"plugins_location"' +# line: '"plugins_location": "/config/plugins",' +# state: present + + - name: Restart Container + docker_container: + name: '{{pgrole}}' + state: started From e91315492015974e028a7ea37c3097396a8f9f5d Mon Sep 17 00:00:00 2001 From: Admin9705 Date: Sun, 13 Jan 2019 13:34:30 -0500 Subject: [PATCH 09/14] update locations for sonarr/radarr4k --- apps/radarr4k.yml | 2 +- apps/sonarr4k.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/radarr4k.yml b/apps/radarr4k.yml index a2a1d19..fa56cf1 100644 --- a/apps/radarr4k.yml +++ b/apps/radarr4k.yml @@ -41,7 +41,7 @@ - name: 'Copy scripts into directory for {{pgrole}}' copy: - src: ./templates/cleanup-radarr.sh + src: /opt/plexguide/containers/templates/cleanup-radarr.sh dest: /opt/appdata/{{pgrole}}/scripts directory_mode: yes force: yes diff --git a/apps/sonarr4k.yml b/apps/sonarr4k.yml index 987bca6..4dbf03c 100644 --- a/apps/sonarr4k.yml +++ b/apps/sonarr4k.yml @@ -41,7 +41,7 @@ - name: 'Copy scripts into directory for {{pgrole}}' copy: - src: ./templates/cleanup-sonarr.sh + src: /opt/plexguide/containers/templates/cleanup-sonarr.sh dest: /opt/appdata/{{pgrole}}/scripts directory_mode: yes force: yes From e3a438b7f4d1b0f65e6b4ed3350d374a3087896d Mon Sep 17 00:00:00 2001 From: Admin9705 Date: Sun, 13 Jan 2019 13:36:46 -0500 Subject: [PATCH 10/14] update locations --- apps/radarr4k.yml | 2 +- apps/sonarr4k.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/radarr4k.yml b/apps/radarr4k.yml index fa56cf1..3d49a24 100644 --- a/apps/radarr4k.yml +++ b/apps/radarr4k.yml @@ -41,7 +41,7 @@ - name: 'Copy scripts into directory for {{pgrole}}' copy: - src: /opt/plexguide/containers/templates/cleanup-radarr.sh + src: /opt/plexguide/containers/templates/radarr/cleanup-radarr.sh dest: /opt/appdata/{{pgrole}}/scripts directory_mode: yes force: yes diff --git a/apps/sonarr4k.yml b/apps/sonarr4k.yml index 4dbf03c..7f355f4 100644 --- a/apps/sonarr4k.yml +++ b/apps/sonarr4k.yml @@ -41,7 +41,7 @@ - name: 'Copy scripts into directory for {{pgrole}}' copy: - src: /opt/plexguide/containers/templates/cleanup-sonarr.sh + src: /opt/plexguide/containers/templates/sonarr/cleanup-sonarr.sh dest: /opt/appdata/{{pgrole}}/scripts directory_mode: yes force: yes From df529decddb8a3fc68fcdf082c8903aee0a35663 Mon Sep 17 00:00:00 2001 From: Admin9705 Date: Sun, 13 Jan 2019 13:39:25 -0500 Subject: [PATCH 11/14] update locations again --- apps/radarr4k.yml | 2 +- apps/sonarr4k.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/radarr4k.yml b/apps/radarr4k.yml index 3d49a24..bc40655 100644 --- a/apps/radarr4k.yml +++ b/apps/radarr4k.yml @@ -41,7 +41,7 @@ - name: 'Copy scripts into directory for {{pgrole}}' copy: - src: /opt/plexguide/containers/templates/radarr/cleanup-radarr.sh + src: /opt/plexguide/containers/templates/radarr/scripts/cleanup-radarr.sh dest: /opt/appdata/{{pgrole}}/scripts directory_mode: yes force: yes diff --git a/apps/sonarr4k.yml b/apps/sonarr4k.yml index 7f355f4..0ca146c 100644 --- a/apps/sonarr4k.yml +++ b/apps/sonarr4k.yml @@ -41,7 +41,7 @@ - name: 'Copy scripts into directory for {{pgrole}}' copy: - src: /opt/plexguide/containers/templates/sonarr/cleanup-sonarr.sh + src: /opt/plexguide/containers/templates/radarr/scripts/cleanup-sonarr.sh dest: /opt/appdata/{{pgrole}}/scripts directory_mode: yes force: yes From 04d7a2f8a355d4acc036fd32a7d0a7a086081281 Mon Sep 17 00:00:00 2001 From: Admin9705 Date: Sun, 13 Jan 2019 13:41:10 -0500 Subject: [PATCH 12/14] fix sonarr locaiton --- apps/sonarr4k.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sonarr4k.yml b/apps/sonarr4k.yml index 0ca146c..a6141e5 100644 --- a/apps/sonarr4k.yml +++ b/apps/sonarr4k.yml @@ -41,7 +41,7 @@ - name: 'Copy scripts into directory for {{pgrole}}' copy: - src: /opt/plexguide/containers/templates/radarr/scripts/cleanup-sonarr.sh + src: /opt/plexguide/containers/templates/sonarr/scripts/cleanup-sonarr.sh dest: /opt/appdata/{{pgrole}}/scripts directory_mode: yes force: yes From 8e58e7c0338a0eed6e112ecb8e57d5cb7c2fc336 Mon Sep 17 00:00:00 2001 From: sneedster Date: Sun, 13 Jan 2019 10:50:04 -0800 Subject: [PATCH 13/14] Update delugevpn.yml --- apps/delugevpn.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apps/delugevpn.yml b/apps/delugevpn.yml index bbeadeb..1f97117 100644 --- a/apps/delugevpn.yml +++ b/apps/delugevpn.yml @@ -27,10 +27,6 @@ - name: 'Including cron job' include_tasks: '/opt/plexguide/containers/_core.yml' - # FOLDER CREATION ############################################################# - - name: 'Including folders' - include_tasks: '/opt/plexguide/containers/_folders.yml' - - name: 'Checking for existing app data' stat: path: /opt/appdata/{{pgrole}}/core.conf @@ -61,7 +57,7 @@ VPN_ENABLED: yes VPN_USER: vpnuser VPN_PASS: vpnpass - VPN_PROV: vpnprov + VPN_PROV: custom ENABLE_PRIVOXY: no STRICT_PORT_FORWARD: no LAN_NETWORK: 192.168.1.1/24 From b36ef573deafec68971215d0f877f781eb534775 Mon Sep 17 00:00:00 2001 From: timekills Date: Mon, 14 Jan 2019 01:06:16 +0430 Subject: [PATCH 14/14] extension left off --- apps/{handbrake => handbrake.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename apps/{handbrake => handbrake.yml} (100%) diff --git a/apps/handbrake b/apps/handbrake.yml similarity index 100% rename from apps/handbrake rename to apps/handbrake.yml