refactor: redis is now a separate cookbook

cookbooks/nextcloud/Makefile

@@ -2,20 +2,20 @@
 ## Makefile for PostgreSQL quadlet
 ##
 
-DEPENDENCIES = postgresql traefik
+DEPENDENCIES = postgresql redis traefik
 
 # Nextcloud quadlet is mapped to the 10008 user (nextcloud) and 10000 group (itix-svc)
 PROJECT_UID = 10008
 PROJECT_GID = 10000
 
-# Include common Makefile
-include ../../scripts/common.mk
-
 # Additional Nextcloud directories and files
 TARGET_FILES += $(TARGET_CHROOT)/etc/quadlets/nextcloud/collabora-seccomp-profile.json
-$(TARGET_CHROOT)/etc/quadlets/nextcloud/collabora-seccomp-profile.json:
+$(TARGET_CHROOT)/etc/quadlets/nextcloud/collabora-seccomp-profile.json: $(TARGET_CHROOT)/etc/quadlets/nextcloud
 	curl -sSfL -o $@ https://raw.githubusercontent.com/CollaboraOnline/online/refs/heads/main/docker/cool-seccomp-profile.json
 
+# Include common Makefile
+include ../../scripts/common.mk
+
 .PHONY: test test-set-nextcloud-major
 
 NEXTCLOUD_MAJOR_START ?= 25

cookbooks/nextcloud/nextcloud-app.container

@@ -1,8 +1,8 @@
 [Unit]
 Description=Nextcloud PHP-FPM Application
 Documentation=https://hub.docker.com/_/nextcloud/
-After=network.target nextcloud-redis.service postgresql-server.service nextcloud-init.service nextcloud-upgrade.service var-lib-virtiofs-data.mount
-Requires=nextcloud-redis.service postgresql-server.service nextcloud-init.service nextcloud-upgrade.service var-lib-virtiofs-data.mount
+After=network.target redis-server.service postgresql-server.service nextcloud-init.service nextcloud-upgrade.service var-lib-virtiofs-data.mount
+Requires=redis-server.service postgresql-server.service nextcloud-init.service nextcloud-upgrade.service var-lib-virtiofs-data.mount
 
 # Only start if Nextcloud has been configured
 ConditionPathExists=/etc/quadlets/nextcloud/config.env

cookbooks/nextcloud/nextcloud-cron.container

@@ -1,8 +1,8 @@
 [Unit]
 Description=Nextcloud Application - Cron Job
 Documentation=https://hub.docker.com/_/nextcloud/
-After=nextcloud-redis.service postgresql-server.service var-lib-virtiofs-data.mount
-Requires=nextcloud-redis.service postgresql-server.service var-lib-virtiofs-data.mount
+After=redis-server.service postgresql-server.service var-lib-virtiofs-data.mount
+Requires=redis-server.service postgresql-server.service var-lib-virtiofs-data.mount
 
 # Only start if Nextcloud has been configured
 ConditionPathExists=/etc/quadlets/nextcloud/config.env

cookbooks/nextcloud/nextcloud-init.container

@@ -1,9 +1,9 @@
 [Unit]
 Description=Nextcloud Application - Initialization
 Documentation=https://hub.docker.com/_/nextcloud/
-After=network.target nextcloud-redis.service postgresql-server.service var-lib-virtiofs-data.mount
+After=network.target redis-server.service postgresql-server.service var-lib-virtiofs-data.mount
 Before=nextcloud-app.service
-Requires=nextcloud-redis.service postgresql-server.service var-lib-virtiofs-data.mount
+Requires=redis-server.service postgresql-server.service var-lib-virtiofs-data.mount
 
 # Only start if Nextcloud has been configured
 ConditionPathExists=/etc/quadlets/nextcloud/config.env

cookbooks/nextcloud/nextcloud-redis.container

@@ -1,56 +0,0 @@
-[Unit]
-Description=Redis Cache for Nextcloud
-Documentation=https://hub.docker.com/_/redis/
-After=network.target 
-
-# Only start if Nextcloud has been configured
-ConditionPathExists=/etc/quadlets/nextcloud/config.env
-
-# Start/stop this unit when the target is started/stopped
-PartOf=nextcloud.target
-
-[Container]
-ContainerName=nextcloud-redis
-Image=nextcloud-redis.image
-
-# Network configuration
-Network=host
-
-# Redis configuration with authentication
-Exec=redis-server /usr/local/etc/redis/redis.conf
-
-# No need for root privileges
-User=redis
-Group=redis
-
-# UID/GID mapping to map the redis (999) user / redis (1000) group inside the container to arbitrary user 10008 / group 10000 on the host
-UIDMap=0:1000000:65535
-UIDMap=+999:10008:1
-GIDMap=0:1000000:65535
-GIDMap=+1000:10000:1
-
-# Environment variables
-Environment=REDISCLI_AUTH=${REDIS_HOST_PASSWORD}
-
-# Volume mounts for data persistence
-Volume=/var/lib/quadlets/nextcloud/redis:/data:Z
-Volume=/etc/quadlets/nextcloud/redis.conf:/usr/local/etc/redis/redis.conf:ro
-
-# Health check
-HealthCmd=redis-cli -t 5 ping | grep -qFx PONG
-HealthInterval=30s
-HealthTimeout=5s
-HealthStartPeriod=10s
-HealthRetries=3
-
-[Service]
-Restart=always
-RestartSec=5
-TimeoutStartSec=300
-TimeoutStopSec=30
-
-# These environment variables are sourced to be used by systemd in the Exec* commands
-EnvironmentFile=/etc/quadlets/nextcloud/config.env
-
-[Install]
-WantedBy=nextcloud.target

cookbooks/nextcloud/nextcloud-redis.image

@@ -1,13 +0,0 @@
-[Unit]
-Description=podman pull docker.io/library/redis
-Documentation=https://hub.docker.com/_/redis/
-
-# Only start if Nextcloud has been configured
-ConditionPathExists=/etc/quadlets/nextcloud/config.env
-
-[Image]
-Image=docker.io/library/redis:${REDIS_MAJOR}-alpine
-
-[Service]
-# These environment variables are sourced to be used by systemd in the Exec* commands
-EnvironmentFile=/etc/quadlets/nextcloud/config.env

cookbooks/nextcloud/nextcloud-upgrade.container

@@ -1,9 +1,9 @@
 [Unit]
 Description=Nextcloud Application - Upgrade
 Documentation=https://hub.docker.com/_/nextcloud/
-After=network.target nextcloud-redis.service postgresql-server.service
+After=network.target redis-server.service postgresql-server.service
 Before=nextcloud-app.service
-Requires=nextcloud-redis.service postgresql-server.service
+Requires=redis-server.service postgresql-server.service
 
 # Only start if Nextcloud has been configured
 ConditionPathExists=/etc/quadlets/nextcloud/config.env

cookbooks/nextcloud/nextcloud.target

@@ -1,8 +1,8 @@
 [Unit]
 Description=Nextcloud Service Target
 Documentation=man:systemd.target(5)
-Requires=postgresql.target nextcloud-redis.service nextcloud-nginx.service nextcloud-app.service nextcloud-init.service nextcloud-upgrade.service nextcloud-cron.timer
-After=postgresql.target nextcloud-redis.service nextcloud-nginx.service nextcloud-app.service nextcloud-init.service nextcloud-upgrade.service
+Requires=postgresql.target redis.target nextcloud-nginx.service nextcloud-app.service nextcloud-init.service nextcloud-upgrade.service nextcloud-cron.timer
+After=postgresql.target redis.target nextcloud-nginx.service nextcloud-app.service nextcloud-init.service nextcloud-upgrade.service
 Before=nextcloud-cron.timer
 
 # Allow isolation - can stop/start this target independently

cookbooks/nextcloud/other/redis/nextcloud.acl

@@ -0,0 +1 @@
+user nextcloud on >nextcloud ~nextcloud:* +@all

cookbooks/quay/Makefile

@@ -6,7 +6,7 @@
 PROJECT_UID = 10026
 PROJECT_GID = 10000
 
-DEPENDENCIES = postgresql lego nftables
+DEPENDENCIES = postgresql redis lego nftables
 
 # Include common Makefile
 include ../../scripts/common.mk

cookbooks/quay/config/examples/app/config.yaml

@@ -2,8 +2,8 @@
 # Copy this file to /etc/quadlets/quay/app/config.yaml and customize it.
 #
 # For more information on configuration options, see:
-# - the json schema of the config tool: https://github.com/quay/app/blob/master/config-tool/utils/generate/schema.json
-# - the json schema of the Python core: https://github.com/quay/app/blob/master/util/config/schema.py
+# - the json schema of the config tool: https://github.com/quay/quay/blob/master/config-tool/utils/generate/schema.json
+# - the json schema of the Python core: https://github.com/quay/quay/blob/master/util/config/schema.py
 
 # The URL at which Quay is accessible, without the scheme.
 SERVER_HOSTNAME: localhost

cookbooks/quay/other/redis/quay.acl

@@ -0,0 +1 @@
+user default on >quay ~quay:* +@all -@dangerous

cookbooks/quay/quay-app.container

@@ -1,8 +1,8 @@
 [Unit]
 Description=Quay Container Registry Application
 Documentation=https://docs.projectquay.io/
-After=network.target quay-redis.service quay-init-certificate.service var-lib-virtiofs-data.mount
-Requires=quay-redis.service quay-init-certificate.service var-lib-virtiofs-data.mount
+After=network.target redis-server.service quay-init-certificate.service var-lib-virtiofs-data.mount
+Requires=redis-server.service quay-init-certificate.service var-lib-virtiofs-data.mount
 
 # Only start if Quay has been configured
 ConditionPathExists=/etc/quadlets/quay/app/config.yaml

cookbooks/quay/quay-redis.container

@@ -1,49 +0,0 @@
-[Unit]
-Description=Redis cache for Quay
-Documentation=https://hub.docker.com/_/redis
-After=network.target var-lib-virtiofs-data.mount
-Requires=var-lib-virtiofs-data.mount
-
-# Only start if Redis has been configured
-ConditionPathExists=/etc/quadlets/quay/redis/redis.env
-ConditionPathExists=/etc/quadlets/quay/redis/redis.conf
-
-# Start/stop this unit when the target is started/stopped
-PartOf=quay.target
-
-[Container]
-ContainerName=quay-redis
-Image=quay-redis.image
-
-# Network configuration
-Network=host
-
-# Redis configuration with authentication
-Exec=redis-server /usr/local/etc/redis/redis.conf
-
-# No need for root privileges
-User=10026
-Group=10000
-
-# Storage
-Volume=/var/lib/virtiofs/data/quay/redis:/data:Z
-Volume=/etc/quadlets/quay/redis/redis.conf:/usr/local/etc/redis/redis.conf:ro,Z
-
-# Health check
-HealthCmd=redis-cli -t 5 ping | grep -qFx PONG
-HealthInterval=30s
-HealthTimeout=5s
-HealthStartPeriod=10s
-HealthRetries=3
-
-[Service]
-Restart=always
-RestartSec=10
-TimeoutStartSec=300
-TimeoutStopSec=30
-
-# These environment variables are sourced to be used by systemd in the Exec* commands
-EnvironmentFile=/etc/quadlets/quay/redis/redis.env
-
-[Install]
-WantedBy=quay.target

cookbooks/quay/quay-redis.image

@@ -1,5 +0,0 @@
-[Unit]
-Description=podman pull docker.io/library/redis:7
-
-[Image]
-Image=docker.io/library/redis:7

cookbooks/quay/quay.target

@@ -1,8 +1,8 @@
 [Unit]
 Description=Quay Container Registry Target
 Documentation=https://docs.projectquay.io/
-Requires=quay-redis.service quay-clair.service quay-app.service quay-init-certificate.service
-After=quay-redis.service quay-clair.service quay-app.service quay-init-certificate.service
+Requires=postgresql.target redis.target quay-clair.service quay-app.service quay-init-certificate.service
+After=postgresql.target redis.target quay-clair.service quay-app.service quay-init-certificate.service
 
 # Allow isolation - can stop/start this target independently
 AllowIsolate=yes

cookbooks/redis/Makefile

@@ -0,0 +1,18 @@
+##
+## Makefile for Redis quadlet
+##
+
+# Redis runs as UID 10021 / GID 10000 on the host
+PROJECT_UID = 10021
+PROJECT_GID = 10000
+
+# Include common Makefile
+include ../../scripts/common.mk
+
+TARGET_FILES += $(TARGET_CHROOT)/etc/quadlets/redis/acl.d
+$(TARGET_CHROOT)/etc/quadlets/redis/acl.d:
+	install -m 0700 -o root -g root -D -d $@
+
+TARGET_REDIS_ACL_FILES = $(patsubst config/examples/acl.d/%, $(TARGET_CHROOT)/etc/quadlets/redis/acl.d/%, $(wildcard config/examples/acl.d/*))
+$(TARGET_REDIS_ACL_FILES): $(TARGET_CHROOT)/etc/quadlets/redis/acl.d/%.acl: config/examples/acl.d/%.acl
+	install -m 0600 -o root -g root $< $@

cookbooks/redis/config/examples/acl.d/probe.acl

@@ -0,0 +1 @@
+user probe on >probe +ping

cookbooks/redis/config/examples/redis.conf

@@ -0,0 +1,11 @@
+# Network settings
+port 6379
+bind 127.0.0.1
+
+# ACL file for multi-tenant access control (generated from acl.d/*.acl fragments)
+aclfile /usr/local/etc/redis/users.acl
+
+# AOF persistence mode
+save ""
+appendonly yes
+appendfsync everysec

cookbooks/redis/config/generate-acl.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+if [[ $# -eq 0 ]]; then
+    set -- /etc/quadlets/redis/users.acl /etc/quadlets/redis/acl.d/*.acl
+fi
+
+target_file="$1"
+shift
+for file in "$@"; do
+    cat "$file"
+    echo
+done > "$target_file"
+
+if ! grep -qE '^user +default' "$target_file"; then
+    echo "Warning: 'user default' entry not found in ACL files. Disabling it in $target_file." >&2
+    echo "user default off"
+fi >> "$target_file"
+
+# Remove empty lines from the generated ACL file
+sed -i '/^$/d' "$target_file"
+
+if [[ -n "${REDIS_UID:-}" && -n "${REDIS_GID:-}" ]]; then
+    chown "$REDIS_UID:$REDIS_GID" "$target_file"
+fi

cookbooks/redis/hooks.mk

@@ -0,0 +1,5 @@
+# Redis ACL fragments
+TARGET_REDIS_FILES = $(patsubst other/redis/%.acl, $(TARGET_CHROOT)/etc/quadlets/redis/acl.d/%.acl, $(wildcard other/redis/*.acl))
+TARGET_EXAMPLE_FILES += $(TARGET_REDIS_FILES)
+$(TARGET_CHROOT)/etc/quadlets/redis/acl.d/%.acl: other/redis/%.acl
+	install -D -m 0644 -o root -g root $< $@

cookbooks/redis/redis-server.container

@@ -0,0 +1,59 @@
+[Unit]
+Description=Redis
+Documentation=https://hub.docker.com/_/redis/
+After=network.target
+RequiresMountsFor=/var/lib/virtiofs/data
+
+# Start/stop this unit when the target is started/stopped
+PartOf=redis.target
+
+# Only start if Redis has been configured
+ConditionPathExists=/etc/quadlets/redis/redis.conf
+
+[Container]
+ContainerName=redis-server
+Image=redis-server.image
+
+# Network configuration
+Network=host
+
+# Redis configuration
+Exec=redis-server /usr/local/etc/redis/redis.conf
+
+# No need for root privileges
+User=redis
+Group=redis
+
+# UID/GID mapping to map the redis user (999) & group (1000) inside the container to host UID 10021 / GID 10000
+UIDMap=0:1000000:65535
+UIDMap=+999:10021:1
+GIDMap=0:1000000:65535
+GIDMap=+1000:10000:1
+
+# Volume mounts for data persistence and configuration
+Volume=/var/lib/virtiofs/data/redis:/data:Z
+Volume=/etc/quadlets/redis/redis.conf:/usr/local/etc/redis/redis.conf:ro,Z
+Volume=/etc/quadlets/redis/users.acl:/usr/local/etc/redis/users.acl:ro,Z
+
+# Password for the "probe" user for health checks
+Environment=REDISCLI_AUTH=probe
+
+# Health check
+HealthCmd=redis-cli --user probe ping | grep -qFx PONG
+HealthInterval=30s
+HealthTimeout=5s
+HealthStartPeriod=10s
+HealthRetries=3
+
+[Service]
+Restart=always
+RestartSec=5
+TimeoutStartSec=300
+TimeoutStopSec=30
+
+# Concatenate all ACL fragments into a single users.acl before starting
+Environment=REDIS_UID=10021 REDIS_GID=10000
+ExecStartPre=/etc/quadlets/redis/generate-acl.sh
+
+[Install]
+WantedBy=redis.target

cookbooks/redis/redis-server.image

@@ -0,0 +1,9 @@
+[Unit]
+Description=podman pull docker.io/library/redis
+Documentation=https://hub.docker.com/_/redis/
+
+# Only start if Redis has been configured
+ConditionPathExists=/etc/quadlets/redis/redis.conf
+
+[Image]
+Image=docker.io/library/redis:8-alpine

cookbooks/redis/redis.target

@@ -0,0 +1,13 @@
+[Unit]
+Description=Redis Service Target
+Documentation=man:systemd.target(5)
+Requires=redis-server.service
+After=redis-server.service
+
+AllowIsolate=yes
+
+# Only start if Redis has been configured
+ConditionPathExists=/etc/quadlets/redis/redis.conf
+
+[Install]
+WantedBy=multi-user.target

cookbooks/redis/tmpfiles.d/redis.conf

@@ -0,0 +1 @@
+d$ /var/lib/virtiofs/data/redis 0700 10021 10000 -

scripts/common.mk

@@ -111,10 +111,10 @@ TARGET_EXAMPLES_SYSCTLD_FILES = $(patsubst sysctl.d/examples/%, $(TARGET_CHROOT)
 TARGET_EXAMPLES_PROFILED_FILES = $(patsubst profile.d/examples/%, $(TARGET_CHROOT)/etc/profile.d/%, $(EXAMPLES_PROFILED_FILES))
 
 # Example quadlet and systemd drop-ins files
-EXAMPLES_QUADLET_DROPINS_FILES := $(shell if [ -d examples ]; then find examples -mindepth 1 -type f | grep -E '\.(container|volume|network|pod|build|image)\.d/' 2>/dev/null; fi)
-EXAMPLES_SYSTEMD_DROPINS_FILES := $(shell if [ -d examples ]; then find examples -mindepth 1 -type f | grep -E '\.(service|target|timer|mount)\.d/' 2>/dev/null; fi)
-TARGET_EXAMPLES_QUADLET_DROPINS_FILES = $(patsubst examples/%, $(TARGET_CHROOT)/etc/containers/systemd/%, $(EXAMPLES_QUADLET_DROPINS_FILES))
-TARGET_EXAMPLES_SYSTEMD_DROPINS_FILES = $(patsubst examples/%, $(TARGET_CHROOT)/etc/systemd/system/%, $(EXAMPLES_SYSTEMD_DROPINS_FILES))
+EXAMPLES_QUADLET_DROPINS_FILES := $(shell if [ -d dropins ]; then find dropins -mindepth 1 -type f | grep -E '\.(container|volume|network|pod|build|image)\.d/' 2>/dev/null; fi)
+EXAMPLES_SYSTEMD_DROPINS_FILES := $(shell if [ -d dropins ]; then find dropins -mindepth 1 -type f | grep -E '\.(service|target|timer|mount)\.d/' 2>/dev/null; fi)
+TARGET_EXAMPLES_QUADLET_DROPINS_FILES = $(patsubst dropins/%, $(TARGET_CHROOT)/etc/containers/systemd/%, $(EXAMPLES_QUADLET_DROPINS_FILES))
+TARGET_EXAMPLES_SYSTEMD_DROPINS_FILES = $(patsubst dropins/%, $(TARGET_CHROOT)/etc/systemd/system/%, $(EXAMPLES_SYSTEMD_DROPINS_FILES))
 
 # All configuration files to be installed
 TARGET_FILES += $(addprefix $(TARGET_CHROOT)/etc/containers/systemd/, $(QUADLETS_FILES)) \
@@ -198,7 +198,11 @@ $(filter-out %.env, $(TARGET_CONFIG_FILES) $(TARGET_EXAMPLES_CONFIG_FILES)):
 	if [ -d $< ]; then \
 		run install -d -m 0755 -o $(PROJECT_UID) -g $(PROJECT_GID) $@; \
 	else \
-		if [ -x $< ]; then \
+		path="$<"; \
+		extension="$${path##*.}"; \
+		if [ "$$extension" == "sh" ] && [ -x "$<" ]; then \
+			run install -m 0755 -o root -g root $< $@; \
+		elif [ -x $< ]; then \
 			run install -m 0755 -o $(PROJECT_UID) -g $(PROJECT_GID) $< $@; \
 		else \
 			run install -m 0644 -o $(PROJECT_UID) -g $(PROJECT_GID) $< $@; \
@@ -210,8 +214,8 @@ $(filter %.env, $(TARGET_CONFIG_FILES) $(TARGET_EXAMPLES_CONFIG_FILES)):
 	install -m 0600 -o root -g root -D $< $@
 
 # Copy systemd and quadlet drop-ins files
-$(TARGET_EXAMPLES_QUADLET_DROPINS_FILES): $(TARGET_CHROOT)/etc/containers/systemd/%: examples/% $(TARGET_CHROOT)/etc/containers/systemd
-$(TARGET_EXAMPLES_SYSTEMD_DROPINS_FILES): $(TARGET_CHROOT)/etc/systemd/system/%: examples/% $(TARGET_CHROOT)/etc/systemd/system
+$(TARGET_EXAMPLES_QUADLET_DROPINS_FILES): $(TARGET_CHROOT)/etc/containers/systemd/%: dropins/% $(TARGET_CHROOT)/etc/containers/systemd
+$(TARGET_EXAMPLES_SYSTEMD_DROPINS_FILES): $(TARGET_CHROOT)/etc/systemd/system/%: dropins/% $(TARGET_CHROOT)/etc/systemd/system
 $(TARGET_EXAMPLES_QUADLET_DROPINS_FILES) $(TARGET_EXAMPLES_SYSTEMD_DROPINS_FILES):
 	install -D -m 0644 -o root -g root $< $@