feat: Force restart coolify proxy
fix: Cannot configure coolify proxy
This commit is contained in:
parent
bc723b3f15
commit
4487846fd7
@ -212,7 +212,7 @@ export async function configureProxyForApplication({ domain, imageId, applicatio
|
|||||||
if (backendAvailable.data.forwardfor.enabled === 'enabled') {
|
if (backendAvailable.data.forwardfor.enabled === 'enabled') {
|
||||||
if (backendAvailable.data.name === domain) {
|
if (backendAvailable.data.name === domain) {
|
||||||
if (server.data.check === 'enabled') {
|
if (server.data.check === 'enabled') {
|
||||||
if (server.data.address === applicationId) {
|
if (server.data.address === imageId) {
|
||||||
if (server.data.port === port) {
|
if (server.data.port === port) {
|
||||||
serverConfigured = true;
|
serverConfigured = true;
|
||||||
}
|
}
|
||||||
|
@ -144,7 +144,7 @@ buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const buildLogQueueName = dev ? cuid() : 'log_queue';
|
const buildLogQueueName = 'log_queue';
|
||||||
const buildLogQueue = new Queue(buildLogQueueName, connectionOptions);
|
const buildLogQueue = new Queue(buildLogQueueName, connectionOptions);
|
||||||
const buildLogWorker = new Worker(buildLogQueueName, async (job) => await logger(job), {
|
const buildLogWorker = new Worker(buildLogQueueName, async (job) => await logger(job), {
|
||||||
concurrency: 1,
|
concurrency: 1,
|
||||||
|
@ -54,9 +54,8 @@ export default async function () {
|
|||||||
const { fqdn } = await db.listSettings();
|
const { fqdn } = await db.listSettings();
|
||||||
if (fqdn) {
|
if (fqdn) {
|
||||||
const domain = getDomain(fqdn);
|
const domain = getDomain(fqdn);
|
||||||
const found = await checkContainer('/var/run/docker.sock', 'coolify-haproxy');
|
await startCoolifyProxy('/var/run/docker.sock');
|
||||||
if (!found) await startCoolifyProxy('/var/run/docker.sock');
|
await configureCoolifyProxyOn(fqdn);
|
||||||
await configureCoolifyProxyOn({ domain });
|
|
||||||
await setWwwRedirection(fqdn);
|
await setWwwRedirection(fqdn);
|
||||||
const isHttps = fqdn.startsWith('https://');
|
const isHttps = fqdn.startsWith('https://');
|
||||||
if (isHttps) await forceSSLOnApplication({ domain });
|
if (isHttps) await forceSSLOnApplication({ domain });
|
||||||
|
@ -42,6 +42,17 @@
|
|||||||
} catch ({ error }) {
|
} catch ({ error }) {
|
||||||
return errorNotification(error);
|
return errorNotification(error);
|
||||||
}
|
}
|
||||||
|
} else if (state === true && destination.isCoolifyProxyUsed === false) {
|
||||||
|
destination.isCoolifyProxyUsed = !destination.isCoolifyProxyUsed;
|
||||||
|
try {
|
||||||
|
await post(`/destinations/${id}/settings.json`, {
|
||||||
|
isCoolifyProxyUsed: destination.isCoolifyProxyUsed,
|
||||||
|
engine: destination.engine
|
||||||
|
});
|
||||||
|
await startProxy();
|
||||||
|
} catch ({ error }) {
|
||||||
|
return errorNotification(error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
async function changeProxySetting() {
|
async function changeProxySetting() {
|
||||||
@ -89,6 +100,24 @@
|
|||||||
return errorNotification(error);
|
return errorNotification(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
async function forceRestartProxy() {
|
||||||
|
try {
|
||||||
|
toast.push('Coolify Proxy restarting...');
|
||||||
|
await post(`/destinations/${id}/stop.json`, { engine: destination.engine });
|
||||||
|
await post(`/destinations/${id}/settings.json`, {
|
||||||
|
isCoolifyProxyUsed: false,
|
||||||
|
engine: destination.engine
|
||||||
|
});
|
||||||
|
await post(`/destinations/${id}/start.json`, { engine: destination.engine });
|
||||||
|
await post(`/destinations/${id}/settings.json`, {
|
||||||
|
isCoolifyProxyUsed: true,
|
||||||
|
engine: destination.engine
|
||||||
|
});
|
||||||
|
window.location.reload();
|
||||||
|
} catch ({ error }) {
|
||||||
|
return errorNotification(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="flex justify-center px-6 pb-8">
|
<div class="flex justify-center px-6 pb-8">
|
||||||
@ -158,6 +187,7 @@
|
|||||||
: ''
|
: ''
|
||||||
}`}
|
}`}
|
||||||
/>
|
/>
|
||||||
|
<button on:click|preventDefault={forceRestartProxy}>Force Restart Proxy</button>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
@ -87,8 +87,7 @@ export const post: RequestHandler = async (event) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (fqdn) {
|
if (fqdn) {
|
||||||
const found = await checkContainer('/var/run/docker.sock', 'coolify-haproxy');
|
await startCoolifyProxy('/var/run/docker.sock');
|
||||||
if (!found) await startCoolifyProxy('/var/run/docker.sock');
|
|
||||||
const domain = getDomain(fqdn);
|
const domain = getDomain(fqdn);
|
||||||
const isHttps = fqdn.startsWith('https://');
|
const isHttps = fqdn.startsWith('https://');
|
||||||
if (domain) {
|
if (domain) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user