diff --git a/config/archive/gallery.config.yml b/config/archive/gallery.config.yml index 4bb0763..adcabd7 100644 --- a/config/archive/gallery.config.yml +++ b/config/archive/gallery.config.yml @@ -69,23 +69,23 @@ sources: # # Extractor settings # -#extractor: +extractor: # Preview image settings #image: # previewSizes: [1920, 1280, 800, 320, 128] # previewQuality: 80 - #video: - # previewSize: 720 # used as preview size and preview filename - # ext: mp4 # used as target video container and preview filename - # scale: -2:'min(720,ih)' # overwrites previewSize. E.g. -2:'min(ih,max(720,min(1080,ih*.5)))' for 720p <= height*0.5 <= 1080p or height, if height < 720 - # frameRate: 30 - # maxVideoBitRate: 4000 # in KB - # videoEncoder: libx264 - # preset: slow - # profile: baseline - # level: '3.0' - # addFfmpegArgs: [...] # Additional ffmpeg args - # customFfmpegArgs: [...] # custom ffmpeg args for video conversion, replaces all other settings such previewSize, videoEncoder, addFfmpegArgs, ... + video: + previewSize: 1080 # used as preview size and preview filename + ext: mp4 # used as target video container and preview filename + scale: -2:'min(720,ih)' # overwrites previewSize. E.g. -2:'min(ih,max(720,min(1080,ih*.5)))' for 720p <= height*0.5 <= 1080p or height, if height < 720 + frameRate: 30 + maxVideoBitRate: 4000 # in KB + videoEncoder: libx264 + preset: slow + profile: baseline + level: '3.0' + #addFfmpegArgs: [...] # Additional ffmpeg args + #customFfmpegArgs: [...] # custom ffmpeg args for video conversion, replaces all other settings such previewSize, videoEncoder, addFfmpegArgs, ... # Api Server is used for image similarity, object and face detection #apiServer: # url: https://api.home-gallery.org @@ -170,7 +170,7 @@ logger: level: info # format: json # File logger format is in newline delimited JSON. See http://ndjson.org - - type: file - # Log level could be one of trace, debug, info, warn, error, fatal, silent - level: debug - file: '{configDir}/{configPrefix}gallery.log' + #- type: file + # # Log level could be one of trace, debug, info, warn, error, fatal, silent + # level: debug + # file: '{configDir}/{configPrefix}gallery.log' diff --git a/config/archive/nginx.conf b/config/archive/nginx.conf deleted file mode 100644 index e49acdb..0000000 --- a/config/archive/nginx.conf +++ /dev/null @@ -1,20 +0,0 @@ -events { - -} - -http { - error_log /etc/nginx/error_log.log warn; - client_max_body_size 20m; - - proxy_cache_path /etc/nginx/cache keys_zone=one:500m max_size=1000m; - - - server { - server_name vod.deflax.net; - root /recordings; - - location /live/ { - autoindex on; - } - } -} diff --git a/config/archive/nginx.conf.dist b/config/archive/nginx.conf.dist deleted file mode 100644 index ce1db9c..0000000 --- a/config/archive/nginx.conf.dist +++ /dev/null @@ -1,20 +0,0 @@ -events { - -} - -http { - error_log /etc/nginx/error_log.log warn; - client_max_body_size 20m; - - proxy_cache_path /etc/nginx/cache keys_zone=one:500m max_size=1000m; - - - server { - server_name vod.example.com; - root /recordings; - - location /live/ { - autoindex on; - } - } -}