fix: update dns challenge settings and use cloudflare , restructure sites, use cloudflare dns

Author: pcfreak30

Diff for: Caddyfile.cluster

@@ -1,22 +1,6 @@
 {
 	# Enable admin API for clustering
 	admin off
-
-	# Global ACME DNS configuration for all sites
-	acme_dns cloudns {
-		auth_id "{$CLOUDNS_AUTH_ID}"
-		auth_password "{$CLOUDNS_AUTH_PASSWORD}"
-	}
-
-	tls {
-		acme {
-			resolvers 1.1.1.1 1.0.0.1
-			disable_tlsalpn_challenge
-			disable_http_challenge
-			dns_ttl 30s
-		}
-	}
-
 	# Configure storage for clustering
 	storage etcd {
 		prefix "{$PORTAL_CORE_CLUSTERED_ETCD_PREFIX}"
@@ -37,12 +21,20 @@
 	}
 }
 
-# Handle all domains matching the PORTAL_CORE_DOMAIN
-*.{$PORTAL_CORE_DOMAIN} {
-	reverse_proxy localhost:{$PORTAL_CORE_PORT}
+# HTTP to HTTPS redirect
+http://*.{$PORTAL_CORE_DOMAIN}, http://{$PORTAL_CORE_DOMAIN} {
+	redir https://{host}{uri} permanent
 }
 
-# Handle direct domain access
-:80, :443 {
+# Handle all HTTPS domains
+*.{$PORTAL_CORE_DOMAIN}, {$PORTAL_CORE_DOMAIN} {
+	tls {
+		dns_ttl 30s
+		resolvers 1.1.1.1 1.0.0.1
+		dns cloudns {
+			auth_id "{$CLOUDNS_AUTH_ID}"
+			auth_password "{$CLOUDNS_AUTH_PASSWORD}"
+		}
+	}
 	reverse_proxy localhost:{$PORTAL_CORE_PORT}
 }

Diff for: Caddyfile.cluster.notls

@@ -2,21 +2,6 @@
 	# Enable admin API for clustering
 	admin off
 
-	# Global ACME DNS configuration for all sites
-	acme_dns cloudns {
-		auth_id "{$CLOUDNS_AUTH_ID}"
-		auth_password "{$CLOUDNS_AUTH_PASSWORD}"
-	}
-
-	tls {
-		acme {
-			resolvers 1.1.1.1 1.0.0.1
-			disable_tlsalpn_challenge
-			disable_http_challenge
-			dns_ttl 30s
-		}
-	}
-
 	# Configure storage for clustering
 	storage etcd {
 		prefix "{$PORTAL_CORE_CLUSTERED_ETCD_PREFIX}"
@@ -31,12 +16,20 @@
 	}
 }
 
-# Handle all domains matching the PORTAL_CORE_DOMAIN
-*.{$PORTAL_CORE_DOMAIN} {
-	reverse_proxy localhost:{$PORTAL_CORE_PORT}
+# HTTP to HTTPS redirect
+http://*.{$PORTAL_CORE_DOMAIN}, http://{$PORTAL_CORE_DOMAIN} {
+	redir https://{host}{uri} permanent
 }
 
-# Handle direct domain access
-:80, :443 {
+# Handle all HTTPS domains
+*.{$PORTAL_CORE_DOMAIN}, {$PORTAL_CORE_DOMAIN} {
+	tls {
+		dns_ttl 30s
+		resolvers 1.1.1.1 1.0.0.1
+		dns cloudns {
+			auth_id "{$CLOUDNS_AUTH_ID}"
+			auth_password "{$CLOUDNS_AUTH_PASSWORD}"
+		}
+	}
 	reverse_proxy localhost:{$PORTAL_CORE_PORT}
 }