Removed redis in favour of drop-in replacement dragonfly, maintaining container name

.gitignore

@@ -4,13 +4,14 @@
 # don't ignore dirs so we can look inside them
 !*/
 
-# but do ignore volumes and subsubdirs
+# but do ignore volumes and subsubsubdirs e.g. hostname/container/configstuff
 volumes/
-*/*/
+*/*/*/*
 
-# only allow .yml files
+# allow the following files
 !*.yml
-
+!*.sh
+!*.conf
 !*.md
 !.gitignore
 .env

homepage/.env

@@ -1 +0,0 @@
-HOMEPAGE_CONFIG_PATH=/mnt/data/storage/homepage/config

homepage/config

@@ -1 +0,0 @@
-/mnt/data/storage/homepage/config/

librespeed/docker-compose.yml

@@ -1,22 +0,0 @@
-version: "2.1"
-services:
-  librespeed:
-    image: lscr.io/linuxserver/librespeed:latest
-    container_name: librespeed
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-      - PASSWORD=PASSWORD
-      - CUSTOM_RESULTS=false #optional
-      - DB_TYPE=mysql #optional
-      - DB_NAME=${DB_NAME} #optional
-      - DB_HOSTNAME=${DB_HOSTNAME} #optional
-      - DB_USERNAME=${DB_USERNAME} #optional
-      - DB_PASSWORD=${DB_PASSWORD} #optional
-      - DB_PORT=${DB_PORT} #optional
-    volumes:
-      - /mnt/data/storage/librespeed/config:/config
-    ports:
-      - 8084:80
-    restart: unless-stopped

naspi/homeassistant/docker-compose.yml

@@ -6,6 +6,11 @@ services:
     volumes:
       - ${HOMEASSISTANT_PATH}/config:/config
       - /etc/localtime:/etc/localtime:ro
+      - /run/dbus:/run/dbus:ro
+    devices:
+      - '/dev/serial/by-id/usb-Nabu_Casa_SkyConnect_v1.0_7cf0ee91b8d8ed11a8216b6162c613ac-if00-port0:/dev/ttyUSB0'
     restart: unless-stopped
     privileged: true
     network_mode: host
+    environment:
+      - TZ=Europe/Stockholm

naspi/homepage/docker-compose.yml

@@ -7,7 +7,7 @@ services:
     network_mode: bridge
     restart: unless-stopped
     ports:
-      - 80:3000
+      - 800:3000
     volumes:
       - ${HOMEPAGE_CONFIG_PATH}:/app/config # Make sure your local config directory exists
       - /var/run/docker.sock:/var/run/docker.sock # (optional) For docker integrations

naspi/nginx-proxy/docker-compose.yml

@@ -19,7 +19,7 @@ services:
       DB_SQLITE_FILE: "/data/database.sqlite"
       DISABLE_IPV6: "true"
     volumes:
-      - ./data:/data
-      - ./letsencrypt:/etc/letsencrypt
+      - /mnt/data/storage/nginx-proxy/data:/data
+      - /mnt/data/storage/nginx-proxy/letsencrypt:/etc/letsencrypt
     networks:
       - proxy

naspi/redis/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3.3'
+services:
+    redis:
+        container_name: redis
+        image: redis:latest
+        restart: always
+        networks:
+         - proxy
+
+networks:
+    proxy:
+        external: true

naspi/startall.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ $(basename $(readlink $PWD)) != $(hostname) ]; then
+	echo "Incorrect directory for host"
+	exit 1
+fi
+
+# will skip folders with a leading "_" (indicating not used)
+
+for d in ./[^_]*/ ; do (cd $d && docker-compose up -d && cd ..); done

naspi/static-server/docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+    nginx:
+        container_name: naspi-static
+        volumes:
+            - /var/www/static:/usr/share/nginx/html:ro
+        ports:
+            - 8888:80
+        image: nginx
+        networks:
+            - proxy
+
+networks:
+    proxy:
+        external: true

naspi/transmission/docker-compose.yml

@@ -8,14 +8,13 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/Stockholm
-      - TRANSMISSION_WEB_HOME=/combustion-release/ #optional
       - USER=${USERNAME} #optional
       - PASS=${PASSWORD} #optional
       - WHITELIST= #optional
       - PEERPORT= #optional
       - HOST_WHITELIST= #optional
     volumes:
-      - ./data:/config
+      - /mnt/data/storage/transmission:/config
       - /mnt/data/downloads:/downloads
     ports:
       - 9091:9091

naspi/update.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+docker pull containrrr/watchtower
+docker run -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower --run-once

photoprism/docker-compose.yml

@@ -1,130 +0,0 @@
-version: '3.5'
-
-# Example Docker Compose config file for PhotoPrism (Linux / AMD64)
-#
-# Note:
-# - Hardware transcoding is only available for sponsors due to the high maintenance and support effort.
-# - Running PhotoPrism on a server with less than 4 GB of swap space or setting a memory/swap limit can cause unexpected
-#   restarts ("crashes"), for example, when the indexer temporarily needs more memory to process large files.
-# - If you install PhotoPrism on a public server outside your home network, please always run it behind a secure
-#   HTTPS reverse proxy such as Traefik or Caddy. Your files and passwords will otherwise be transmitted
-#   in clear text and can be intercepted by anyone, including your provider, hackers, and governments:
-#   https://docs.photoprism.app/getting-started/proxies/traefik/
-#
-# Setup Guides:
-# - https://docs.photoprism.app/getting-started/docker-compose/
-# - https://docs.photoprism.app/getting-started/raspberry-pi/
-#
-# Troubleshooting Checklists:
-# - https://docs.photoprism.app/getting-started/troubleshooting/
-# - https://docs.photoprism.app/getting-started/troubleshooting/docker/
-# - https://docs.photoprism.app/getting-started/troubleshooting/mariadb/
-#
-# CLI Commands:
-# - https://docs.photoprism.app/getting-started/docker-compose/#command-line-interface
-#
-# All commands may have to be prefixed with "sudo" when not running as root.
-# This will point the home directory shortcut ~ to /root in volume mounts.
-
-services:
-  photoprism:
-    container_name: photoprism
-    image: photoprism/photoprism:latest  # :preview to test preview builds
-    ## Don't enable automatic restarts until PhotoPrism has been properly configured and tested!
-    ## If the service gets stuck in a restart loop, this points to a memory, filesystem, network, or database issue:
-    ## https://docs.photoprism.app/getting-started/troubleshooting/#fatal-server-errors
-    restart: unless-stopped
-    security_opt:
-      - seccomp:unconfined
-      - apparmor:unconfined
-    ports:
-      - "2342:2342" # HTTP port (host:container)
-    environment:
-      PHOTOPRISM_ADMIN_USER: "admin"                 # superadmin username
-      PHOTOPRISM_ADMIN_PASSWORD: "insecure"          # initial superadmin password (minimum 8 characters)
-      PHOTOPRISM_AUTH_MODE: "password"               # authentication mode (public, password)
-      PHOTOPRISM_SITE_URL: "${SITE_URL}"             # server URL in the format "http(s)://domain.name(:port)/(path)"
-      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: "false"              # 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: "true"                 # 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: "sqlite"         # SQLite is an embedded database that doesn't require a server
-      PHOTOPRISM_DATABASE_DRIVER: "mysql"            # use MariaDB 10.5+ or MySQL 8+ instead of SQLite for improved performance
-      PHOTOPRISM_DATABASE_SERVER: "${DATABASE_SERVER}" # MariaDB or MySQL database server (hostname:port)
-      PHOTOPRISM_DATABASE_NAME: "${DATABASE_NAME}"   # MariaDB or MySQL database schema name
-      PHOTOPRISM_DATABASE_USER: "${DATABASE_USER}"   # 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: ""                     # meta site author
-      ## Run/install on first startup (options: update https gpu tensorflow davfs clitools clean):
-      # PHOTOPRISM_INIT: "https gpu tensorflow"
-      ## Hardware Video Transcoding:
-      PHOTOPRISM_FFMPEG_ENCODER: "raspberry"        # 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: 1000
-      # PHOTOPRISM_UMASK: 0000
-    ## Start as non-root user before initialization (supported: 0, 33, 50-99, 500-600, and 900-1200):
-    # user: "1000:1000"
-    ## Share hardware devices with FFmpeg and TensorFlow (optional):
-    # devices:
-    #  - "/dev/dri:/dev/dri"                         # Intel QSV
-    #  - "/dev/nvidia0:/dev/nvidia0"                 # Nvidia CUDA
-    #  - "/dev/nvidiactl:/dev/nvidiactl"
-    #  - "/dev/nvidia-modeset:/dev/nvidia-modeset"
-    #  - "/dev/nvidia-nvswitchctl:/dev/nvidia-nvswitchctl"
-    #  - "/dev/nvidia-uvm:/dev/nvidia-uvm"
-    #  - "/dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools"
-    #  - "/dev/video11:/dev/video11"                 # Video4Linux Video Encode Device (h264_v4l2m2m)
-    working_dir: "/photoprism" # do not change or remove
-    ## Storage Folders: "~" is a shortcut for your home directory, "." for the current directory
-    volumes:
-      # "/host/folder:/photoprism/folder"                # Example
-      # - "~/Pictures:/photoprism/originals"             # Original media files (DO NOT REMOVE)
-      # - "/example/family:/photoprism/originals/family" # *Additional* media folders can be mounted like this
-      # - "~/Import:/photoprism/import"                  # *Optional* base folder from which files can be imported to originals
-      # - "./storage:/photoprism/storage"                # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)
-
-      - /mnt/hdd/Media/Photos/Originals:/photoprism/originals
-      - /mnt/hdd/Media/Photos/Import:/photoprism/import
-      - /mnt/data/storage/photoprism:/photoprism/storage
-    networks:
-      - default
-      - proxy
-
-  ## -- (database server section removed; use separate mariadb container)
-
-  ## Watchtower upgrades services automatically (optional)
-  ## see https://docs.photoprism.app/getting-started/updates/#watchtower
-  ## activate via "COMPOSE_PROFILES=update docker compose up -d"
-  #watchtower:
-  #  restart: unless-stopped
-  #  image: containrrr/watchtower
-  #  profiles: ["update"]
-  #  environment:
-  #    WATCHTOWER_CLEANUP: "true"
-  #    WATCHTOWER_POLL_INTERVAL: 7200 # checks for updates every two hours
-  #  volumes:
-  #    - "/var/run/docker.sock:/var/run/docker.sock"
-  #    - "~/.docker/config.json:/config.json" # optional, for authentication if you have a Docker Hub account
-
-networks:
-  default:
-    name: mariadb_default
-    external: true
-  proxy:
-    external: true

redis/docker-compose.yml

@@ -1,5 +0,0 @@
-version: '3.3'
-services:
-    redis:
-        container_name: redis
-        image: redis:latest

thinkcentre/dragonfly/docker-compose.yml

@@ -0,0 +1,8 @@
+services:
+    dragonfly:
+        container_name: redis  # for compatibility
+        network_mode: host
+        ulimits:
+            memlock: -1
+        image: docker.dragonflydb.io/dragonflydb/dragonfly
+        restart: always

thinkcentre/jellyfin/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   jellyfin:
     image: jellyfin/jellyfin
@@ -9,7 +7,8 @@ services:
     volumes:
       - /mnt/data/storage/jellyfin/config:/config
       - /mnt/data/storage/jellyfin/cache:/cache
-      - /mnt/data/media:/media
+      - media:/media
+      - /mnt/data/downloads/complete:/downloads
 
     #ports:
     #  - "8096:8096/tcp"
@@ -24,3 +23,9 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
 
+volumes:
+  media:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.1.100,nfsvers=4"
+      device: ":/mnt/data/media/"

thinkcentre/minecraft/docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3.3'
+
+services:
+    minecraft-server:
+        volumes:
+            - ./server:/data
+            - ./mods:/data/mods
+        environment:
+            - TYPE=FABRIC
+            - MEMORY=4G
+            - VERSION=1.20.4
+            - EULA=TRUE
+            - MOTD=Hej och välkommen!
+        ports:
+            - '25565:25565'
+        container_name: minecraft
+        image: itzg/minecraft-server
+

thinkcentre/nextcloud/NOTES.md

@@ -0,0 +1,3 @@
+Remember to move the cronjob if moving between servers:
+
+*/5  *  *  *  * /usr/bin/docker container exec -u www-data nextcloud php -f cron.php --define apc.enable_cli=1

thinkcentre/nextcloud/docker-compose.yml

@@ -1,8 +1,5 @@
 version: '2'
 
-volumes:
-  app:
-
 services:
   app:
     container_name: nextcloud
@@ -27,5 +24,8 @@ networks:
   mariadb_default:
     external: true
   proxy:
-#    name: proxy
+    name: proxy
     external: true
+
+volumes:
+  app:

thinkcentre/startall.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ $(basename $(readlink $PWD)) != $(hostname) ]; then
+	echo "Incorrect directory for host"
+	exit 1
+fi
+
+# will skip folders with a leading "_" (indicating not used)
+
+for d in ./[^_]*/ ; do (cd $d && docker-compose up -d && cd ..); done

thinkcentre/static-server/default.conf

@@ -0,0 +1,45 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}
+

thinkcentre/static-server/docker-compose.yml

@@ -0,0 +1,21 @@
+version: '3.9'
+
+services:
+  web:
+    container_name: thinkcentre-static
+    image: nginx:latest
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - ./src:/var/www/html
+      - ./src/minecraft/mods:/home/thord/minecraft/mods
+      - ./default.conf:/etc/nginx/conf.d/default.conf
+    links:
+      - php-fpm
+
+  php-fpm:
+    container_name: nginx-php-fpm
+    image: php:8-fpm
+    volumes:
+      - ./src:/var/www/html

thinkcentre/update.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+docker pull containrrr/watchtower
+docker run -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower --run-once