From 54677ac8bdd04110c87565ea8856f778a94f65f9 Mon Sep 17 00:00:00 2001 From: borgal Date: Wed, 8 Feb 2023 21:18:47 +0100 Subject: [PATCH] VDR update --- jellyfin/.env.sample | 2 - jellyfin/docker-compose.yml | 32 ---------- photoprism/.env.sample | 8 --- photoprism/docker-compose.yml | 115 ---------------------------------- vdr/docker-compose.yml | 6 +- 5 files changed, 3 insertions(+), 160 deletions(-) delete mode 100644 jellyfin/.env.sample delete mode 100644 jellyfin/docker-compose.yml delete mode 100644 photoprism/.env.sample delete mode 100644 photoprism/docker-compose.yml diff --git a/jellyfin/.env.sample b/jellyfin/.env.sample deleted file mode 100644 index 3fc0cd9..0000000 --- a/jellyfin/.env.sample +++ /dev/null @@ -1,2 +0,0 @@ -NFS_SERVER=192.168.0.xxx # oder hostname oder Domain -PFAD_HD=/Pfad/zum/Ordner/HD \ No newline at end of file diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml deleted file mode 100644 index 7b795bf..0000000 --- a/jellyfin/docker-compose.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -version: "2.1" -services: - jellyfin: - image: lscr.io/linuxserver/jellyfin - container_name: jellyfin - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Berlin - - JELLYFIN_PublishedServerUrl=192.168.0.111 - devices: - - /dev/dri:/dev/dri - volumes: - - ./config:/config - - ./tvseries:/data/tvshows - - hd:/data/movies - ports: - - 8096:8096 - - 8920:8920 #optional - - 7359:7359/udp #optional - - 1905:1900/udp #optional - restart: unless-stopped - -volumes: - hd: - name: hd - driver: local - driver_opts: - type: nfs - o: addr=${NFS_SERVER},rw - device: ":${PFAD_HD}" diff --git a/photoprism/.env.sample b/photoprism/.env.sample deleted file mode 100644 index 109ff13..0000000 --- a/photoprism/.env.sample +++ /dev/null @@ -1,8 +0,0 @@ -#MySQL Datenbank -ADMIN_PASSWORD=ChangeMe -DATABASE_PASSWORD=ChangeMe -ROOT_PASSWORD=ChangeMe - -NFS_SERVER=192.168.0.xxx -Photos=/mnt/Pfad/zu/den/Bildern -cache=/mnt/Pfad/zu/dem/cache diff --git a/photoprism/docker-compose.yml b/photoprism/docker-compose.yml deleted file mode 100644 index ccff894..0000000 --- a/photoprism/docker-compose.yml +++ /dev/null @@ -1,115 +0,0 @@ -version: '3.5' - -# DOCKER COMPOSE COMMAND REFERENCE -# see https://docs.photoprism.app/getting-started/docker-compose/#command-line-interface -# -------------------------------------------------------------------------- -# Start | docker-compose up -d -# Stop | docker-compose stop -# Update | docker-compose pull -# Logs | docker-compose logs --tail=25 -f -# Terminal | docker-compose exec photoprism bash -# Help | docker-compose exec photoprism photoprism help -# Config | docker-compose exec photoprism photoprism config -# Reset | docker-compose exec photoprism photoprism reset -# Backup | docker-compose exec photoprism photoprism backup -a -i -# Restore | docker-compose exec photoprism photoprism restore -a -i -# Index | docker-compose exec photoprism photoprism index -# Reindex | docker-compose exec photoprism photoprism index -f -# Import | docker-compose exec photoprism photoprism import - -services: - photoprism: - image: photoprism/photoprism:latest - container_name: Photoprism_App - depends_on: - - mariadb - restart: unless-stopped - security_opt: - - seccomp:unconfined - - apparmor:unconfined - ports: - - "2342:2342" - environment: - PHOTOPRISM_ADMIN_PASSWORD: "${ADMIN_PASSWORD}" # INITIAL PASSWORD FOR "admin" USER, MINIMUM 8 CHARACTERS - PHOTOPRISM_AUTH_MODE: "password" # authentication mode (public, password) - PHOTOPRISM_SITE_URL: "https://photo.borgal.de" # public server URL incl http:// or https:// and /path, :port is optional - PHOTOPRISM_AUTO_INDEX: 60 - PHOTOPRISM_ORIGINALS_LIMIT: 5000 # file size limit for originals in MB (increase for high-res video) - PHOTOPRISM_HTTP_COMPRESSION: "gzip" # improves transfer speed and bandwidth utilization (none or gzip) - PHOTOPRISM_LOG_LEVEL: "info" # log level: trace, debug, info, warning, error, fatal, or panic - PHOTOPRISM_READONLY: "false" # do not modify originals directory (reduced functionality) - PHOTOPRISM_EXPERIMENTAL: "false" # enables experimental features - PHOTOPRISM_DISABLE_CHOWN: "yes" # disables updating storage permissions via chmod and chown on startup - PHOTOPRISM_DISABLE_WEBDAV: "false" # disables built-in WebDAV server - PHOTOPRISM_DISABLE_SETTINGS: "false" # disables settings UI and API - PHOTOPRISM_DISABLE_TENSORFLOW: "false" # disables all features depending on TensorFlow - PHOTOPRISM_DISABLE_FACES: "false" # disables face detection and recognition (requires TensorFlow) - PHOTOPRISM_DISABLE_CLASSIFICATION: "false" # disables image classification (requires TensorFlow) - PHOTOPRISM_DISABLE_RAW: "false" # disables indexing and conversion of RAW files - PHOTOPRISM_RAW_PRESETS: "false" # enables applying user presets when converting RAW files (reduces performance) - PHOTOPRISM_JPEG_QUALITY: 85 # a higher value increases the quality and file size of JPEG images and thumbnails (25-100) - PHOTOPRISM_DETECT_NSFW: "false" # automatically flags photos as private that MAY be offensive (requires TensorFlow) - PHOTOPRISM_UPLOAD_NSFW: "true" # allows uploads that MAY be offensive (no effect without TensorFlow) - PHOTOPRISM_DATABASE_DRIVER: "mysql" # use MariaDB 10.5+ or MySQL 8+ instead of SQLite for improved performance - PHOTOPRISM_DATABASE_SERVER: "mariadb:3306" # MariaDB or MySQL database server (hostname:port) - PHOTOPRISM_DATABASE_NAME: "photoprism" # MariaDB or MySQL database schema name - PHOTOPRISM_DATABASE_USER: "photoprism" # MariaDB or MySQL database user name - PHOTOPRISM_DATABASE_PASSWORD: "${DATABASE_PASSWORD}" # MariaDB or MySQL database user password - PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App" - PHOTOPRISM_SITE_DESCRIPTION: "" # meta site description - PHOTOPRISM_SITE_AUTHOR: "Borgal" # meta site author - working_dir: "/photoprism" # do not change or remove - - ## Run/install on first startup (options: update gpu tensorflow davfs clitools clean): - # PHOTOPRISM_INIT: "gpu tensorflow" - ## Hardware Video Transcoding (for sponsors only due to high maintenance and support costs): - # PHOTOPRISM_FFMPEG_ENCODER: "software" # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry") - # PHOTOPRISM_FFMPEG_BITRATE: "32" # FFmpeg encoding bitrate limit in Mbit/s (default: 50) - ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200): - PHOTOPRISM_UID: 1000 - PHOTOPRISM_GID: 1001 - PHOTOPRISM_UMASK: 0002 - user: "1000:1001" - - volumes: - - "./storage:/photoprism/storage" # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE) - - "storage:/photoprism/storage/cache/thumbnails" # Original media files (DO NOT REMOVE) - - "Photos:/photoprism/originals" # *Additional* media folders can be mounted like this - #- "./Pictures:/photoprism/originals" # Original media files (DO NOT REMOVE) - #- "Photos:/photoprism/originals/Digicam-Bilder" # *Additional* media folders can be mounted like this - #- "~/Import:/photoprism/import" # *Optional* base folder from which files can be imported to originals - - ## Database Server (recommended) - mariadb: - restart: unless-stopped - image: mariadb:10.9 - container_name: Photoprism_DB - security_opt: - - seccomp:unconfined - - apparmor:unconfined - command: mysqld --innodb-buffer-pool-size=512M --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120 - volumes: - - "./database:/var/lib/mysql" - environment: - MARIADB_AUTO_UPGRADE: "1" - MARIADB_INITDB_SKIP_TZINFO: "1" - MARIADB_DATABASE: "photoprism" - MARIADB_USER: "photoprism" - MARIADB_PASSWORD: "${DATABASE_PASSWORD}" - MARIADB_ROOT_PASSWORD: "${ROOT_PASSWORD}" - -volumes: - Photos: - name: Photos - driver: local - driver_opts: - type: nfs - o: addr=${NFS_SERVER},rw - device: ":${Photos}" - storage: - name: storage - driver: local - driver_opts: - type: nfs - o: addr=${NFS_SERVER},rw - device: ":${cache}" \ No newline at end of file diff --git a/vdr/docker-compose.yml b/vdr/docker-compose.yml index c211f6e..04fa8d9 100644 --- a/vdr/docker-compose.yml +++ b/vdr/docker-compose.yml @@ -9,7 +9,7 @@ services: - TZ=Europe/Berlin - LANG=de_DE.UTF-8 - LOG2FILE=true - - PLUGINS=epgsearch live streamdev-server ddci2 markad svdrpservice vnsiserver + - PLUGINS=epgsearch live streamdev-server ddci2 svdrpservice markad #vnsiserver volumes: - ./system:/vdr/system - ./config:/vdr/config @@ -22,8 +22,8 @@ services: - 2004:2004 - 6419:6419 - 6419:6419/udp - - 34890:34890 #optional-vnsi - - 8099:8099 #optional + #- 34890:34890 #optional-vnsi + #- 8099:8099 #optional devices: - /dev/dvb:/dev/dvb cap_add: