From f4354a57bddb76b71d9291a4081e1527dcc92928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Thu, 8 Jan 2026 19:18:27 +0000
Subject: [PATCH] WiP

---
 Makefile.common                                | 18 +++++++++++-------
 traefik/Makefile                               | 12 ------------
 .../examples/conf.d}/itix-middlewares.yaml     |  0
 .../examples/conf.d}/ping.yaml                 |  0
 .../{other => config/examples}/itix-admins.txt |  0
 .../{other => config/examples}/itix-users.txt  |  0
 6 files changed, 11 insertions(+), 19 deletions(-)
 rename traefik/{other => config/examples/conf.d}/itix-middlewares.yaml (100%)
 rename traefik/{other => config/examples/conf.d}/ping.yaml (100%)
 rename traefik/{other => config/examples}/itix-admins.txt (100%)
 rename traefik/{other => config/examples}/itix-users.txt (100%)

diff --git a/Makefile.common b/Makefile.common
index 755a8a3..8fcc485 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -73,7 +73,7 @@ SYSTEMD_TIMER_NAMES := $(wildcard *.timer)
 SYSTEMD_MAIN_UNIT_NAMES := $(wildcard *.target)
 
 # Configuration files
-CONFIG_FILES = $(filter-out %/examples, $(wildcard config/*))
+CONFIG_FILES := $(shell find config/ -mindepth 1 \! -path "config/examples/*")
 TMPFILESD_FILES = $(filter-out %/examples, $(wildcard tmpfiles.d/*))
 SYSCTLD_FILES = $(filter-out %/examples, $(wildcard sysctl.d/*))
 TARGET_CONFIG_FILES = $(patsubst config/%, $(TARGET_CHROOT)/etc/quadlets/$(PROJECT_NAME)/%, $(CONFIG_FILES))
@@ -81,7 +81,7 @@ TARGET_TMPFILESD_FILES = $(patsubst tmpfiles.d/%, $(TARGET_CHROOT)/etc/tmpfiles.
 TARGET_SYSCTLD_FILES = $(patsubst sysctl.d/%, $(TARGET_CHROOT)/etc/sysctl.d/%, $(SYSCTLD_FILES))
 
 # Example configuration files
-EXAMPLES_CONFIG_FILES = $(wildcard config/examples/*)
+EXAMPLES_CONFIG_FILES := $(shell find config/examples -mindepth 1)
 EXAMPLES_TMPFILESD_FILES = $(wildcard tmpfiles.d/examples/*)
 EXAMPLES_SYSCTLD_FILES = $(wildcard sysctl.d/examples/*)
 TARGET_EXAMPLES_CONFIG_FILES = $(patsubst config/examples/%, $(TARGET_CHROOT)/etc/quadlets/$(PROJECT_NAME)/%, $(EXAMPLES_CONFIG_FILES))
@@ -155,11 +155,15 @@ $(TARGET_EXAMPLES_CONFIG_FILES): $(TARGET_CHROOT)/etc/quadlets/$(PROJECT_NAME)/%
 $(filter-out %.env, $(TARGET_CONFIG_FILES) $(TARGET_EXAMPLES_CONFIG_FILES)):
 	@run() { echo $$*; "$$@"; }; \
 	set -Eeuo pipefail; \
-	if [ -x $< ]; then \
-		run install -D -m 0755 -o $(PROJECT_UID) -g $(PROJECT_GID) $< $@; \
+	if [ -d $< ]; then \
+		run install -d -m 0755 -o $(PROJECT_UID) -g $(PROJECT_GID) $@; \
 	else \
-		run install -D -m 0644 -o $(PROJECT_UID) -g $(PROJECT_GID) $< $@; \
-	fi
+		if [ -x $< ]; then \
+			run install -m 0755 -o $(PROJECT_UID) -g $(PROJECT_GID) $< $@; \
+		else \
+			run install -m 0644 -o $(PROJECT_UID) -g $(PROJECT_GID) $< $@; \
+		fi ; \
+	fi; \
 
 # Handle .env files separately to set more restrictive permissions
 $(filter %.env, $(TARGET_CONFIG_FILES) $(TARGET_EXAMPLES_CONFIG_FILES)):
@@ -256,7 +260,7 @@ uninstall: pre-requisites uninstall-pre
 	if [ -f /etc/tmpfiles.d/$(PROJECT_NAME).conf ]; then \
 		run systemd-tmpfiles --purge /etc/tmpfiles.d/$(PROJECT_NAME).conf; \
 	fi
-	rm -f $(TARGET_FILES) $(TARGET_EXAMPLE_FILES)
+	rm -df $(TARGET_FILES) $(TARGET_EXAMPLE_FILES)
 	systemctl daemon-reload
 	$(MAKE) uninstall-post
 
diff --git a/traefik/Makefile b/traefik/Makefile
index b7feca3..0f1b777 100644
--- a/traefik/Makefile
+++ b/traefik/Makefile
@@ -9,15 +9,3 @@ PROJECT_GID = 10000
 TOP_LEVEL_DIR := ..
 include $(TOP_LEVEL_DIR)/Makefile.common
 
-$(TARGET_CHROOT)/etc/quadlets/traefik/conf.d:
-	install -m 0755 -o $(PROJECT_UID) -g $(PROJECT_GID) -d $@
-
-$(TARGET_CHROOT)/etc/quadlets/traefik/conf.d/itix-middlewares.yaml $(TARGET_CHROOT)/etc/quadlets/traefik/conf.d/ping.yaml: $(TARGET_CHROOT)/etc/quadlets/traefik/conf.d/%: other/%
-	install -m 0644 -o $(PROJECT_UID) -g $(PROJECT_GID) $< $@
-
-$(TARGET_CHROOT)/etc/quadlets/traefik/itix-admins.txt $(TARGET_CHROOT)/etc/quadlets/traefik/itix-users.txt: $(TARGET_CHROOT)/etc/quadlets/traefik/%: other/%
-	install -m 0600 -o $(PROJECT_UID) -g $(PROJECT_GID) $< $@
-
-install-config: $(TARGET_CHROOT)/etc/quadlets/traefik/conf.d
-
-install-examples: $(TARGET_CHROOT)/etc/quadlets/traefik/conf.d/itix-middlewares.yaml $(TARGET_CHROOT)/etc/quadlets/traefik/itix-admins.txt $(TARGET_CHROOT)/etc/quadlets/traefik/itix-users.txt
diff --git a/traefik/other/itix-middlewares.yaml b/traefik/config/examples/conf.d/itix-middlewares.yaml
similarity index 100%
rename from traefik/other/itix-middlewares.yaml
rename to traefik/config/examples/conf.d/itix-middlewares.yaml
diff --git a/traefik/other/ping.yaml b/traefik/config/examples/conf.d/ping.yaml
similarity index 100%
rename from traefik/other/ping.yaml
rename to traefik/config/examples/conf.d/ping.yaml
diff --git a/traefik/other/itix-admins.txt b/traefik/config/examples/itix-admins.txt
similarity index 100%
rename from traefik/other/itix-admins.txt
rename to traefik/config/examples/itix-admins.txt
diff --git a/traefik/other/itix-users.txt b/traefik/config/examples/itix-users.txt
similarity index 100%
rename from traefik/other/itix-users.txt
rename to traefik/config/examples/itix-users.txt