Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fixes

Browse Source
This commit is contained in:
Andras Bacsai 2022-11-03 15:54:39 +01:00
parent 363755c3bf
commit abf271fb68
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/api/src/routes/api/v1/settings/handlers.ts
View File

@ -2,7 +2,7 @@ import { promises as dns } from 'dns';
import { X509Certificate } from 'node:crypto';
import type { FastifyReply, FastifyRequest } from 'fastify';
import { asyncExecShell, checkDomainsIsValidInDNS, decrypt, encrypt, errorHandler, isDNSValid, isDomainConfigured, listSettings, prisma } from '../../../../lib/common';
import { asyncExecShell, checkDomainsIsValidInDNS, decrypt, encrypt, errorHandler, isDev, isDNSValid, isDomainConfigured, listSettings, prisma } from '../../../../lib/common';
import { CheckDNS, CheckDomain, DeleteDomain, OnlyIdInBody, SaveSettings, SaveSSHKey } from './types';
@ -91,7 +91,7 @@ export async function checkDomain(request: FastifyRequest<CheckDomain>) {
if (found) {
throw "Domain already configured";
}
if (isDNSCheckEnabled && !forceSave) {
if (isDNSCheckEnabled && !forceSave && !isDev) {
const hostname = request.hostname.split(':')[0]
return await checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts });
}

30
apps/api/src/routes/webhooks/traefik/handlers.ts
View File

@ -128,7 +128,7 @@ async function applicationConfiguration(traefik: any, remoteId: string | null =
traefik.http.routers[`${id}-${port || 'default'}-secure`] = {
entrypoints: ['websecure'],
rule: `(Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`))${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: isCustomSSL ? true : {
certresolver: 'letsencrypt'
},
@ -139,7 +139,7 @@ async function applicationConfiguration(traefik: any, remoteId: string | null =
traefik.http.routers[`${id}-${port || 'default'}-secure-www`] = {
entrypoints: ['websecure'],
rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: isCustomSSL ? true : {
certresolver: 'letsencrypt'
},
@ -148,7 +148,7 @@ async function applicationConfiguration(traefik: any, remoteId: string | null =
traefik.http.routers[`${id}-${port || 'default'}-secure`] = {
entrypoints: ['websecure'],
rule: `Host(\`${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: {
domains: {
main: `${domain}`
@ -161,7 +161,7 @@ async function applicationConfiguration(traefik: any, remoteId: string | null =
traefik.http.routers[`${id}-${port || 'default'}-secure-www`] = {
entrypoints: ['websecure'],
rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: {
domains: {
main: `${domain}`
@ -172,7 +172,7 @@ async function applicationConfiguration(traefik: any, remoteId: string | null =
traefik.http.routers[`${id}-${port || 'default'}-secure`] = {
entrypoints: ['websecure'],
rule: `Host(\`${domain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: isCustomSSL ? true : {
certresolver: 'letsencrypt'
},
@ -323,7 +323,7 @@ async function serviceConfiguration(traefik: any, remoteId: string | null = null
traefik.http.routers[`${id}-${port || 'default'}-secure`] = {
entrypoints: ['websecure'],
rule: `(Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`))${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: isCustomSSL ? true : {
certresolver: 'letsencrypt'
},
@ -334,7 +334,7 @@ async function serviceConfiguration(traefik: any, remoteId: string | null = null
traefik.http.routers[`${id}-${port || 'default'}-secure-www`] = {
entrypoints: ['websecure'],
rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: isCustomSSL ? true : {
certresolver: 'letsencrypt'
},
@ -343,7 +343,7 @@ async function serviceConfiguration(traefik: any, remoteId: string | null = null
traefik.http.routers[`${id}-${port || 'default'}-secure`] = {
entrypoints: ['websecure'],
rule: `Host(\`${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: {
domains: {
main: `${domain}`
@ -356,7 +356,7 @@ async function serviceConfiguration(traefik: any, remoteId: string | null = null
traefik.http.routers[`${id}-${port || 'default'}-secure-www`] = {
entrypoints: ['websecure'],
rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: {
domains: {
main: `${domain}`
@ -367,7 +367,7 @@ async function serviceConfiguration(traefik: any, remoteId: string | null = null
traefik.http.routers[`${id}-${port || 'default'}-secure`] = {
entrypoints: ['websecure'],
rule: `Host(\`${domain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: isCustomSSL ? true : {
certresolver: 'letsencrypt'
},
@ -420,7 +420,7 @@ async function coolifyConfiguration(traefik: any) {
traefik.http.routers[`${id}-${port || 'default'}-secure`] = {
entrypoints: ['websecure'],
rule: `(Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`))${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: isCustomSSL ? true : {
certresolver: 'letsencrypt'
},
@ -431,7 +431,7 @@ async function coolifyConfiguration(traefik: any) {
traefik.http.routers[`${id}-${port || 'default'}-secure-www`] = {
entrypoints: ['websecure'],
rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: isCustomSSL ? true : {
certresolver: 'letsencrypt'
},
@ -440,7 +440,7 @@ async function coolifyConfiguration(traefik: any) {
traefik.http.routers[`${id}-${port || 'default'}-secure`] = {
entrypoints: ['websecure'],
rule: `Host(\`${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: {
domains: {
main: `${domain}`
@ -453,7 +453,7 @@ async function coolifyConfiguration(traefik: any) {
traefik.http.routers[`${id}-${port || 'default'}-secure-www`] = {
entrypoints: ['websecure'],
rule: `Host(\`www.${nakedDomain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: {
domains: {
main: `${domain}`
@ -464,7 +464,7 @@ async function coolifyConfiguration(traefik: any) {
traefik.http.routers[`${id}-${port || 'default'}-secure`] = {
entrypoints: ['websecure'],
rule: `Host(\`${domain}\`)${pathPrefix ? ` && PathPrefix(\`${pathPrefix}\`)` : ''}`,
service: `${id}`,
service: `${id}-${port || 'default'}`,
tls: isCustomSSL ? true : {
certresolver: 'letsencrypt'
},