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

fix: Traefik

Browse Source
This commit is contained in:
Andras Bacsai 2022-05-17 14:06:07 +02:00
parent 5a206a140c
commit e563988596
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/routes/applications/[id]/index.svelte
View File

@ -74,6 +74,7 @@
let isNonWWWDomainOK = false; let isNonWWWDomainOK = false;
let isWWWDomainOK = false; let isWWWDomainOK = false;
$: isDisabled = !$session.isAdmin || $status.application.isRunning;
let wsgis = [ let wsgis = [
{ {
value: 'None', value: 'None',
@ -85,9 +86,7 @@
} }
]; ];
function containerClass() { function containerClass() {
if (!$session.isAdmin || $status.application.isRunning) { return 'text-white border border-dashed border-coolgray-300 bg-transparent font-thin px-0';
return 'text-white border border-dashed border-coolgray-300 bg-transparent font-thin px-0';
}
} }
if (browser && window.location.hostname === 'demo.coolify.io' && !application.fqdn) { if (browser && window.location.hostname === 'demo.coolify.io' && !application.fqdn) {
application.fqdn = `http://${cuid()}.demo.coolify.io`; application.fqdn = `http://${cuid()}.demo.coolify.io`;
@ -402,7 +401,7 @@
value={application.destinationDocker.name} value={application.destinationDocker.name}
id="destination" id="destination"
disabled disabled
class="bg-transparent " class="bg-transparent"
/> />
</div> </div>
</div> </div>
@ -413,8 +412,8 @@
> >
<div class="custom-select-wrapper"> <div class="custom-select-wrapper">
<Select <Select
isDisabled={!$session.isAdmin || $status.application.isRunning} {isDisabled}
containerClasses={containerClass()} containerClasses={isDisabled && containerClass()}
id="baseImages" id="baseImages"
showIndicator={!$status.application.isRunning} showIndicator={!$status.application.isRunning}
items={application.baseImages} items={application.baseImages}
@ -434,8 +433,8 @@
<div class="custom-select-wrapper"> <div class="custom-select-wrapper">
<Select <Select
isDisabled={!$session.isAdmin || $status.application.isRunning} {isDisabled}
containerClasses={containerClass()} containerClasses={isDisabled && containerClass()}
id="baseBuildImages" id="baseBuildImages"
showIndicator={!$status.application.isRunning} showIndicator={!$status.application.isRunning}
items={application.baseBuildImages} items={application.baseBuildImages}
@ -470,8 +469,8 @@
</div> </div>
<div> <div>
<input <input
readonly={!$session.isAdmin || $status.application.isRunning} readonly={isDisabled}
disabled={!$session.isAdmin || $status.application.isRunning} disabled={isDisabled}
bind:this={domainEl} bind:this={domainEl}
name="fqdn" name="fqdn"
id="fqdn" id="fqdn"
@ -576,7 +575,7 @@
<label for="exposePort" class="text-base font-bold text-stone-100">Exposed Port</label> <label for="exposePort" class="text-base font-bold text-stone-100">Exposed Port</label>
<input <input
readonly={!$session.isAdmin && !$status.application.isRunning} readonly={!$session.isAdmin && !$status.application.isRunning}
disabled={!$session.isAdmin || $status.application.isRunning} disabled={isDisabled}
name="exposePort" name="exposePort"
id="exposePort" id="exposePort"
bind:value={application.exposePort} bind:value={application.exposePort}

2
src/routes/webhooks/traefik/main.json.ts
View File

@ -59,7 +59,7 @@ function configureMiddleware({ id, port, domain, nakedDomain, isHttps, isWWW, is
if (isDualCerts) { if (isDualCerts) {
traefik.http.routers[`${id}-secure`] = { traefik.http.routers[`${id}-secure`] = {
entrypoints: ['websecure'], entrypoints: ['websecure'],
rule: `Host(\`${domain}\`) || Host(\`www.${nakedDomain}\`)`, rule: `Host(\`${nakedDomain}\`) || Host(\`www.${nakedDomain}\`)`,
service: `${id}`, service: `${id}`,
tls: { tls: {
certresolver: 'letsencrypt' certresolver: 'letsencrypt'