From 3e635b285e02a3cf3df08db547e1dbc8497ad122 Mon Sep 17 00:00:00 2001
From: SDGDen <sdgden@sdgcloud.nl>
Date: Mon, 9 Mar 2026 04:57:42 +0100
Subject: [PATCH] updated some thing relating to domainless setup

---
 deploy.sh                  | 17 ++++++++++++++++-
 gencerts.sh                |  2 +-
 setup/Domainless Setup.txt | 13 ++-----------
 stacks/pihole/compose.yml  |  1 -
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 93b6e4f..acdb87a 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -257,9 +257,12 @@ cd /opt/dockge
 curl "https://dockge.kuma.pet/compose.yaml?port=5001&stacksPath=%2Fopt%2Fstacks" --output compose.yaml
 
 # write configuration to compose files
+mkdir -p /opt/files
 cp -r $scriptdir/stacks /opt
-cp -r $scriptdir/setup /opt/stacks
+cp -r $scriptdir/setup /opt/files
 chmod -R 775 /opt/stacks
+chmod -R 775 /opt/files
+
 
 cd /opt/stacks
 git clone https://github.com/trantienloi2404/youtube-downloader.git downloader
@@ -291,6 +294,14 @@ replace_string_recursive "/opt/stacks" "?bookstackdbrootpass?" $bookstackdbrootp
 #onlyofficeJWT
 replace_string_recursive "/opt/stacks" "?onlyofficeJWT?" $onlyofficeJWT
 
+#domain
+replace_string_recursive "/opt/files" "?domain?" $domain
+#publicip
+replace_string_recursive "/opt/files" "?publicip?" $publicip
+#localip
+replace_string_recursive "/opt/files" "?localip?" $localip
+#adminemail
+replace_string_recursive "/opt/files" "?adminemail?" $adminemail
 
 # install mailcow to /opt/stacks/mailcow so it shows up in dockge
 umask 0022
@@ -477,6 +488,10 @@ site.$domain
 Add any other subdomains you want to use.
 EOF
 
+cat >/opt/stacks/pihole/dns/02-wildcard.conf <<EOF
+address=/?domain?/?localip?
+EOF
+
 echo ""
 echo ""
 echo ""
diff --git a/gencerts.sh b/gencerts.sh
index 855b341..d01e963 100644
--- a/gencerts.sh
+++ b/gencerts.sh
@@ -10,7 +10,7 @@ if [ -z "$DOMAIN" ]; then
     exit 1
 fi
 
-CERTS_DIR="/opt/stacks/browser/data/certs"
+CERTS_DIR="/opt/files/certs/"
 
 # Create certs directory if it doesn't exist
 mkdir -p "$CERTS_DIR"
diff --git a/setup/Domainless Setup.txt b/setup/Domainless Setup.txt
index 69fd735..8b436ef 100644
--- a/setup/Domainless Setup.txt	
+++ b/setup/Domainless Setup.txt	
@@ -1,17 +1,8 @@
 You can set up your cloud without purchasing a domain. 
 
-to do this, skip DNS setup during initial install, this means you cannot reach the various services via hostname yet.
+for this, your pihole DNS is already set up to directly point ?domain? to ?localip?
 
-Then, go to http://?localip?:5380 and log in with your admin password, this is your pihole dashboard.
-
-go to settings > local dns records and add two records:
-
-| domain        | IP
-| ?domain?      | ?localip?
-| *.?domain     | ?localip?
-
-
-now you can reach your cloud with whichever domain you want as long as you are on the pihole DNS.
+as long as you are connected to the pihole DNS and on the local network, you will be able to reach your cloud.
 
 The VPN is set up by default to use this DNS, so you will also be able to reach your cloud when using your VPN, allowing use on the go.
 
diff --git a/stacks/pihole/compose.yml b/stacks/pihole/compose.yml
index 39084d1..1264aad 100644
--- a/stacks/pihole/compose.yml
+++ b/stacks/pihole/compose.yml
@@ -7,7 +7,6 @@ services:
     ports:
       - 53:53/tcp
       - 53:53/udp
-      - 5380:80
     environment:
       TZ: ?timezone?
       FTLCONF_WEBSERVER_API_PASSWORD: ?adminpass?