Merge pull request #257 from coollabsio/v2.2.6

v2.2.6

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.2.4",
+	"version": "2.2.6",
 	"license": "AGPL-3.0",
 	"scripts": {
 		"dev": "docker-compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev",

src/lib/haproxy/configuration.ts

@@ -33,6 +33,7 @@ frontend http
   bind :80
   bind :443 ssl crt /usr/local/etc/haproxy/ssl/ alpn h2,http/1.1
   acl is_certbot path_beg /.well-known/acme-challenge/
+
   {{#applications}}
   {{#isHttps}}
   http-request redirect scheme https code ${
@@ -43,6 +44,7 @@ frontend http
 		dev ? 302 : 301
 	} if { req.hdr(host) -i {{redirectTo}} }
   {{/applications}}
+
   {{#services}}
   {{#isHttps}}
   http-request redirect scheme https code ${
@@ -53,6 +55,7 @@ frontend http
 		dev ? 302 : 301
 	} if { req.hdr(host) -i {{redirectTo}} }
   {{/services}}
+
   {{#coolify}}
   {{#isHttps}}
   http-request redirect scheme https code ${
@@ -63,6 +66,7 @@ frontend http
 		dev ? 302 : 301
 	} if { req.hdr(host) -i {{redirectTo}} }
   {{/coolify}}
+
   use_backend backend-certbot if is_certbot
   use_backend %[req.hdr(host),lower]
 
@@ -82,6 +86,13 @@ backend backend-certbot
 # updatedAt={{updatedAt}}
 backend {{domain}}
   option forwardfor
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
   server {{id}} {{id}}:{{port}}
 {{/isRunning}}
 {{/applications}}
@@ -91,6 +102,13 @@ backend {{domain}}
 # updatedAt={{updatedAt}}
 backend {{domain}}
   option forwardfor
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
   server {{id}} {{id}}:{{port}}
 {{/isRunning}}
 {{/services}}
@@ -99,6 +117,13 @@ backend {{domain}}
 backend {{domain}}
   option forwardfor
   option httpchk GET /undead.json
+  {{#isHttps}}
+  http-request add-header X-Forwarded-Proto https
+  {{/isHttps}}
+  {{^isHttps}}
+  http-request add-header X-Forwarded-Proto http
+  {{/isHttps}}
+  http-request add-header X-Forwarded-Host %[req.hdr(host),lower]
   server {{id}} {{id}}:{{port}} check fall 10
 {{/coolify}}
 `;

src/routes/settings/index.json.ts

@@ -66,15 +66,10 @@ export const post: RequestHandler = async (event) => {
 	const { fqdn, isRegistrationEnabled, dualCerts, minPort, maxPort } = await event.request.json();
 	try {
 		const { id } = await db.listSettings();
-		if (isRegistrationEnabled) {
+		await db.prisma.setting.update({ where: { id }, data: { isRegistrationEnabled, dualCerts } });
-			await db.prisma.setting.update({ where: { id }, data: { isRegistrationEnabled } });
-		}
 		if (fqdn) {
 			await db.prisma.setting.update({ where: { id }, data: { fqdn } });
 		}
-		if (dualCerts) {
-			await db.prisma.setting.update({ where: { id }, data: { dualCerts } });
-		}
 		if (minPort && maxPort) {
 			await db.prisma.setting.update({ where: { id }, data: { minPort, maxPort } });
 		}