Merge remote-tracking branch 'upstream/v8.5' into Transmission

This commit is contained in:
Cody
2019-02-28 20:41:36 -05:00
5 changed files with 68 additions and 3 deletions

View File

@@ -113,7 +113,7 @@
# FOR AUTHENTICATION
- name: 'Script Execute Part I'
shell: 'bash /opt/plexguide/menu/pgshield/drop.sh'
shell: 'bash /opt/pgshield/menu/pgshield/drop.sh'
- name: 'Script Execute Part II'
shell: 'cat /var/plexguide/auth.var'

64
apps/dockergc.yml Normal file
View File

@@ -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'

View File

@@ -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'

View File

@@ -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'

View File

@@ -48,6 +48,7 @@
pg_env:
UID: '1000'
GID: '1000'
DOMAIN: {{pgrole}}.{{domain.stdout}}
# MAIN DEPLOYMENT #############################################################
- name: 'Deploying {{pgrole}}'