Merge pull request #42 from PGBlitz/v8.5.6

catch up

apps/flexget.yml

@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Title:      FlexGet
+# Author(s):  paranoidi, Chase Sterling, cpoppema
+# URL:        https://flexget.com/ | https://github.com/cpoppema/docker-flexget
+# GNU:        MIT
+################################################################################
+---
+- hosts: localhost
+  gather_facts: false
+  tasks:
+    # FACTS #######################################################################
+    - name: 'Set Known Facts'
+      set_fact:
+        pgrole: 'flexget'
+        intport: '5050'
+        extport: '6060'
+        image: 'cpoppema/docker-flexget:latest'
+
+    # CORE (MANDATORY) ############################################################
+    - name: 'Including cron job'
+      include_tasks: '/opt/communityapps/apps/_core.yml'
+
+    # 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:
+          - '/etc/localtime:/etc/localtime:ro'
+          - '/opt/appdata/{{pgrole}}:/config'
+          - '{{path.stdout}}:{{path.stdout}}'
+          - '/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}}'

apps/nzbget-mp4.yml

@@ -57,7 +57,7 @@
 
     - name: 'Copy custom init scripts into directory for {{pgrole}}'
       copy:
-        src: /opt/communityapps/apps/templates/nzbget-mp4/cont-init.d/30-config
+        src: /opt/communityapps/apps/templates/{{pgrole}}/cont-init.d/30-config
         dest: /opt/appdata/{{pgrole}}/cont-init.d
         directory_mode: yes
         force: yes
@@ -67,7 +67,7 @@
 
     - name: 'Copy custom install scripts into directory for {{pgrole}}'
       copy:
-        src: /opt/communityapps/apps/templates/nzbget-mp4/installer/installer.sh
+        src: /opt/communityapps/apps/templates/{{pgrole}}/installer/installer.sh
         dest: /opt/appdata/{{pgrole}}/installer
         directory_mode: yes
         force: yes
@@ -77,7 +77,7 @@
 
     - name: 'Copy custom mp4 config into directory for {{pgrole}}'
       copy:
-        src: /opt/communityapps/apps/templates/nzbget-mp4/MP4_Automator/autoProcess.ini
+        src: /opt/communityapps/apps/templates/{{pgrole}}/MP4_Automator/autoProcess.ini
         dest: /opt/appdata/{{pgrole}}/scripts/MP4_Automator
         directory_mode: yes
         force: yes
@@ -87,7 +87,7 @@
 
     - name: 'Copy custom NZBGetPostProcess script config into directory for {{pgrole}}'
       copy:
-        src: /opt/communityapps/apps/templates/nzbget-mp4/MP4_Automator/TEMPLATEPPScript
+        src: /opt/communityapps/apps/templates/{{pgrole}}/MP4_Automator/TEMPLATEPPScript
         dest: /opt/appdata/{{pgrole}}/
         directory_mode: yes
         force: yes
@@ -97,7 +97,7 @@
 
     - name: 'Copy ffmpeg build script into directory for {{pgrole}}'
       copy:
-        src: /opt/communityapps/apps/templates/nzbget-mp4/ffmpeg-build/web-install.sh
+        src: /opt/communityapps/apps/templates/{{pgrole}}/ffmpeg-build/web-install.sh
         dest: /opt/appdata/{{pgrole}}/ffmpeg-build
         directory_mode: yes
         force: yes
@@ -107,7 +107,7 @@
 
     - name: 'Copy ffmpeg build script into directory for {{pgrole}}'
       copy:
-        src: /opt/communityapps/apps/templates/nzbget-mp4/ffmpeg-build/build-ffmpeg
+        src: /opt/communityapps/apps/templates/{{pgrole}}/ffmpeg-build/build-ffmpeg
         dest: /opt/appdata/{{pgrole}}/ffmpeg-build
         directory_mode: yes
         force: yes
@@ -117,7 +117,7 @@
 
     - name: 'Copy custom init scripts into directory for {{pgrole}}'
       copy:
-        src: /opt/communityapps/apps/templates/nzbget-mp4/services.d/run
+        src: /opt/communityapps/apps/templates/{{pgrole}}/services.d/run
         dest: /opt/appdata/{{pgrole}}/services.d
         directory_mode: yes
         force: yes

apps/rflood-openvpn.yml

@@ -0,0 +1,78 @@
+#!/bin/bash
+#
+# Title:      rTorrent + FloodUI integrated OpenVPN
+# Author(s):  h1f0x
+# URL:        https://github.com/h1f0x/rtorrent-flood-openvpn
+# GNU:        General Public License v3.0
+################################################################################
+---
+- hosts: localhost
+  gather_facts: false
+  tasks:
+    # FACTS #######################################################################
+
+    - name: 'Set Known Facts'
+      set_fact:
+        pgrole: 'rflood-openvpn'
+        intport: '80'
+        extport: '5896'
+        image: 'h1f0x/rtorrent-flood-openvpn'
+
+    # CORE (MANDATORY) ############################################################
+    - name: 'Including cron job'
+      include_tasks: '/opt/communityapps/apps/_core.yml'
+
+    - name: 'Including plugins'
+      include_tasks: '/opt/communityapps/apps/_plugins.yml'
+
+    - name: 'Including folders'
+      include_tasks: '/opt/communityapps/apps/_downloaders.yml'
+
+    - 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'
+          - '/mnt/downloads/{{pgrole}}:/output/complete'
+          - '/mnt/incomplete/{{pgrole}}:/output/incomplete'
+          - '/etc/localtime:/etc/localtime:ro'
+
+    - name: 'Setting PG ENV'
+      set_fact:
+        pg_env:
+          UID: 1000
+          GID: 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}}'
+        privileged: yes
+        state: started
+        labels: '{{pg_labels}}'

apps/templates/nzbget/MP4_Automator/autoProcess.ini

@@ -24,7 +24,7 @@ apikey =
 [MP4]
 ffmpeg = /config/ffmpeg-build/workspace/bin/ffmpeg
 ffprobe = /config/ffmpeg-build/workspace/bin/ffprobe
-threads = 1
+threads = 0
 output_directory = 
 copy_to = 
 move_to = 
@@ -38,7 +38,8 @@ video-crf = 18
 video-max-width = 
 h264-max-level = 4.1
 use-qsv-decoder-with-encoder = True
-ios-audio = libfdk_aac
+use-hevc-qsv-decoder = False
+ios-audio = True
 ios-first-track-only = False
 ios-audio-filter = dynaudnorm
 max-audio-channels = 
@@ -47,17 +48,17 @@ audio-language = eng
 audio-default-language = eng
 audio-channel-bitrate = 256
 audio-filter = 
-subtitle-codec = srt
+subtitle-codec = mov_text
 subtitle-language = eng
 subtitle-default-language = 
 subtitle-encoding = 
 fullpathguess = True
-convert-mp4 = True
+convert-mp4 = False
 tagfile = True
 tag-language = en
 download-artwork = Poster
 download-subs = True
-embed-subs = False
+embed-subs = True
 sub-providers = addic7ed,podnapisi,thesubdb,opensubtitles
 permissions = 0777
 post-process = False

apps/templates/nzbget/ffmpeg-build/build-ffmpeg

@@ -175,8 +175,8 @@ if build "yasm"; then
 fi
 
 if build "nasm"; then
-	download "http://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.gz" "nasm.tar.gz"
-	cd $PACKAGES/nasm-2.13.03 || exit
+	download "http://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.14.02.tar.gz" "nasm.tar.gz"
+	cd $PACKAGES/nasm-2.14.02 || exit
 	execute ./configure --prefix=${WORKSPACE} --disable-shared --enable-static
 	execute make -j $MJOBS
 	execute make install

apps/zammad.yml

@@ -0,0 +1,68 @@
+#!/bin/bash
+#
+# Title:      PGBlitz (Reference Title File)
+# Author(s):  Admin9705
+# URL:        https://pgblitz.com - http://github.pgblitz.com
+# GNU:        General Public License v3.0
+################################################################################
+---
+- hosts: localhost
+  gather_facts: false
+  tasks:
+# CORE (MANDATORY) DO NOT CHANGE ###########################################
+
+    - name: 'Set Known Facts'
+      set_fact:
+        pgrole: "zammad"
+        intport: "80"
+        extport: "8777"
+        image: "zammad/zammad"
+
+    - name: 'Including cron job'
+      include_tasks: '/opt/communityapps/apps/_core.yml'
+
+# EXTRA FUNCTIONS REQUIRED BY THE ROLE #####################################
+
+##### NOTHING REQUIRED
+
+# LABELS #### KEEPS BOTTOM CLEAN ###########################################
+    - 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}}'
+          - '/mnt:/mnt'
+          - '/etc/localtime:/etc/localtime:ro'
+
+    - name: 'Setting PG ENV'
+      set_fact:
+        pg_env:
+          PUID: '1000'
+          PGID: '1000'
+
+    # MAIN SCRIPT ##############################################################
+
+    - 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}}'