Merge branch 'v8.6' into v8.5.6

apps/templates/broken/nzbthrottle.yml

@@ -1,78 +0,0 @@
-#!/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:
-    # FACTS #######################################################################
-    - name: 'Set Known Facts'
-      set_fact:
-        pgrole: 'nzbthrottle'
-        intport: '0'
-        extport: '0'
-        image: 'daghaian/nzbthrottle'
-
-    # CORE (MANDATORY) ############################################################
-    - name: 'Including cron job'
-      include_tasks: '/opt/communityapps/apps/_core.yml'
-
-    - name: 'Checking {{pgrole}}'s json existance'
-      stat:
-        path: '/opt/communityapps/apps/templates/{{pgrole}}/config.json'
-      register: jsoncheck
-
-    - name: 'Copying file for {{pgrole}}'
-      copy:
-        src: '/opt/communityapps/apps/templates/{{pgrole}}/config.json'
-        dest: '/opt/appdata/{{pgrole}}/{{pgrole}}/config.json'
-        directory_mode: yes
-        force: yes
-        owner: '1000'
-        group: '1000'
-        mode: 0755
-      when: not jsoncheck.stat.exists
-
-    # 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.json:/{{pgrole}}/config.json:ro'
-
-    - 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/templates/dokuwiki/users.auth.php

@@ -0,0 +1 @@
+admin:$1$4fd0ad31$.cId7p1uxI4a.RcrH81On0:DokuWiki Administrator:mail@host.com:admin,user

apps/templates/nzbget/MP4_Automator/autoProcess.ini

@@ -39,7 +39,7 @@ video-max-width =
 h264-max-level = 4.1
 use-qsv-decoder-with-encoder = True
 use-hevc-qsv-decoder = False
-ios-audio = True
+ios-audio = libfdk_aac
 ios-first-track-only = False
 ios-audio-filter = dynaudnorm
 max-audio-channels = 
@@ -48,7 +48,7 @@ audio-language = eng
 audio-default-language = eng
 audio-channel-bitrate = 256
 audio-filter = 
-subtitle-codec = mov_text
+subtitle-codec = srt
 subtitle-language = eng
 subtitle-default-language = 
 subtitle-encoding = 
@@ -58,7 +58,7 @@ tagfile = True
 tag-language = en
 download-artwork = Poster
 download-subs = True
-embed-subs = True
+embed-subs = False
 sub-providers = addic7ed,podnapisi,thesubdb,opensubtitles
 permissions = 0777
 post-process = False

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

@@ -175,7 +175,7 @@ if build "yasm"; then
 fi
 
 if build "nasm"; then
-	download "http://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.14.02.tar.gz" "nasm.tar.gz"
+	download "http://www.nasm.us/pub/nasm/releasebuilds/2.14.02/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