diff --git a/app/Actions/Proxy/StartProxy.php b/app/Actions/Proxy/StartProxy.php index 652b9fc66..87cae6522 100644 --- a/app/Actions/Proxy/StartProxy.php +++ b/app/Actions/Proxy/StartProxy.php @@ -28,14 +28,14 @@ class StartProxy $commands = $commands->merge([ "apt-get update > /dev/null 2>&1 || true", - "command -v lsof >/dev/null || echo '####### Installing lsof...'", + "command -v lsof >/dev/null || echo '####### Installing lsof.'", "command -v lsof >/dev/null || apt install -y lsof", "command -v lsof >/dev/null || command -v fuser >/dev/null || apt install -y psmisc", "mkdir -p $proxy_path && cd $proxy_path", - "echo '####### Creating Docker Compose file...'", - "echo '####### Pulling docker image...'", + "echo '####### Creating Docker Compose file.'", + "echo '####### Pulling docker image.'", 'docker compose pull', - "echo '####### Stopping existing coolify-proxy...'", + "echo '####### Stopping existing coolify-proxy.'", "docker compose down -v --remove-orphans > /dev/null 2>&1", "command -v fuser >/dev/null || command -v lsof >/dev/null || echo '####### Could not kill existing processes listening on port 80 & 443. Please stop the process holding these ports...'", "command -v lsof >/dev/null && lsof -nt -i:80 | xargs -r kill -9 || true", @@ -45,9 +45,9 @@ class StartProxy "systemctl disable nginx > /dev/null 2>&1 || true", "systemctl disable apache2 > /dev/null 2>&1 || true", "systemctl disable apache > /dev/null 2>&1 || true", - "echo '####### Starting coolify-proxy...'", + "echo '####### Starting coolify-proxy.'", 'docker compose up -d --remove-orphans', - "echo '####### Proxy installed successfully...'" + "echo '####### Proxy installed successfully.'" ]); $commands = $commands->merge(connectProxyToNetworks($server)); if (!$async) { diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php index ea0f069c7..992e6205c 100644 --- a/bootstrap/helpers/proxy.php +++ b/bootstrap/helpers/proxy.php @@ -20,7 +20,7 @@ function connectProxyToNetworks(Server $server) { $commands = $networks->map(function ($network) { return [ "echo '####### Connecting coolify-proxy to $network network...'", - "docker network ls --format '{{.Name}}' | grep '^$network$' || docker network create --attachable $network", + "docker network ls --format '{{.Name}}' | grep '^$network$' || docker network create --attachable $network >/dev/null", "docker network connect $network coolify-proxy >/dev/null 2>&1 || true", ]; }); diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php index f1efe397e..0d76d46ea 100644 --- a/bootstrap/helpers/remoteProcess.php +++ b/bootstrap/helpers/remoteProcess.php @@ -101,7 +101,7 @@ function generateSshCommand(Server $server, string $command, bool $isMux = true) . " 'bash -se' << \\$delimiter" . PHP_EOL . $command . PHP_EOL . $delimiter; - ray($ssh_command); + // ray($ssh_command); return $ssh_command; } function instant_remote_process(Collection|array $command, Server $server, $throwError = true) diff --git a/resources/views/livewire/server/proxy/deploy.blade.php b/resources/views/livewire/server/proxy/deploy.blade.php index 5d2a27da8..534ee7388 100644 --- a/resources/views/livewire/server/proxy/deploy.blade.php +++ b/resources/views/livewire/server/proxy/deploy.blade.php @@ -24,7 +24,7 @@ - Stop + Stop Proxy @else diff --git a/resources/views/livewire/server/proxy/status.blade.php b/resources/views/livewire/server/proxy/status.blade.php index 48c96a0d0..69007d59f 100644 --- a/resources/views/livewire/server/proxy/status.blade.php +++ b/resources/views/livewire/server/proxy/status.blade.php @@ -1,12 +1,12 @@
@if ($server->isFunctional())
- @if ($server->proxy->status === 'running') - - @elseif ($server->proxy->status === 'restarting') - + @if (data_get($server, 'proxy.status') === 'running') + + @elseif (data_get($server, 'proxy.status') === 'restarting') + @else - + @endif