From fec4a1834c77ff73e725e69d15ff28e28dd190b6 Mon Sep 17 00:00:00 2001
From: Michele Cereda <cereda.michele@gmail.com>
Date: Mon, 20 May 2024 18:51:18 +0200
Subject: [PATCH] fix(containers): generate files only when needed

---
 containers/nextcloud/Makefile | 15 +++++++++------
 containers/syncthing/Makefile |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/containers/nextcloud/Makefile b/containers/nextcloud/Makefile
index 2f21cee..ac9501e 100644
--- a/containers/nextcloud/Makefile
+++ b/containers/nextcloud/Makefile
@@ -3,14 +3,14 @@
 pre-flight: override nextcloud_admin_user ?= nextcloud
 pre-flight: override nextcloud_admin_password ?= nextcloud
 pre-flight: override postgres_user ?= postgres
-pre-flight: override postgres_password ?= nextcloud
+pre-flight: override postgres_password ?= ${shell openssl rand -base64 32}
 pre-flight: override postgres_db ?= ${postgres_user}
 pre-flight:
-	@echo '${nextcloud_admin_user}' > 'nextcloud_admin_user.txt'
-	@echo '${nextcloud_admin_password}' > 'nextcloud_admin_password.txt'
-	@echo '${postgres_user}' > 'postgres_user.txt'
-	@echo '${postgres_password}' > 'postgres_password.txt'
-	@echo '${postgres_db}' > 'postgres_db.txt'
+	@[[ -f 'nextcloud_admin_user.txt' ]] || echo '${nextcloud_admin_user}' > 'nextcloud_admin_user.txt'
+	@[[ -f 'nextcloud_admin_password.txt' ]] || echo '${nextcloud_admin_password}' > 'nextcloud_admin_password.txt'
+	@[[ -f 'postgres_user.txt' ]] || echo '${postgres_user}' > 'postgres_user.txt'
+	@[[ -f 'postgres_password.txt' ]] || echo '${postgres_password}' > 'postgres_password.txt'
+	@[[ -f 'postgres_db.txt' ]] || echo '${postgres_db}' > 'postgres_db.txt'
 
 firewalld-open: override service_name ?= nextcloud
 firewalld-open: override port ?= 8080
@@ -24,3 +24,6 @@ firewalld-open: ${shell which 'firewall-cmd'}
 
 composition-go-brrr: ${shell which 'docker-compose'} pre-flight
 	@docker-compose up -d
+
+clean:
+	@docker volume rm 'nextcloud_config' 'nextcloud_custom_apps' 'nextcloud_data' 'nextcloud_db' 'nextcloud_nextcloud'
diff --git a/containers/syncthing/Makefile b/containers/syncthing/Makefile
index af063c6..00fe6eb 100644
--- a/containers/syncthing/Makefile
+++ b/containers/syncthing/Makefile
@@ -1,7 +1,7 @@
 #!/usr/bin/env make
 
 pre-flight:
-	@mkdir -pv 'config' 'data'
+	@mkdir -pv 'data'
 
 firewalld-open: ${shell which 'firewall-cmd'}
 	@sudo firewall-cmd --permanent --add-service 'syncthing'