diff --git a/app/Actions/Proxy/CheckProxySettingsInSync.php b/app/Actions/Proxy/CheckProxySettingsInSync.php index e4d565bc1..ce2b4c034 100644 --- a/app/Actions/Proxy/CheckProxySettingsInSync.php +++ b/app/Actions/Proxy/CheckProxySettingsInSync.php @@ -22,7 +22,7 @@ public function __invoke(Server $server, bool $reset = false) $docker_compose_yml_base64 = base64_encode($final_output); $server->extra_attributes->last_saved_proxy_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value; $server->save(); - if (is_null($output)) { + if (is_null($output) || $reset) { instantRemoteProcess([ "mkdir -p $proxy_path", "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml", diff --git a/resources/views/components/naked-modal.blade.php b/resources/views/components/naked-modal.blade.php index b78c09b3e..f2e965c3f 100644 --- a/resources/views/components/naked-modal.blade.php +++ b/resources/views/components/naked-modal.blade.php @@ -3,13 +3,13 @@ 'message' => 'Are you sure you want to delete this?', 'action' => 'delete', ]) -
-
-
-
-
{{ $message }}
-
- +
+
+
+
+
{{ $message }}
+
+ Yes No diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php index 577243d2e..3532c5e49 100644 --- a/resources/views/livewire/server/proxy.blade.php +++ b/resources/views/livewire/server/proxy.blade.php @@ -13,6 +13,9 @@ $server->extra_attributes->last_applied_proxy_settings && $server->extra_attributes->last_saved_proxy_settings !== $server->extra_attributes->last_applied_proxy_settings)
Configuration out of sync.
+ + Reconfigure + @endif @if ($server->extra_attributes->proxy_status !== 'running') @@ -22,33 +25,29 @@ Stop @endif - - Show - Configuration - -
- +
+ +
+
+
+
- - + @isset($proxy_settings) +

Configuration

+ @if ($selectedProxy->value === 'TRAEFIK_V2') +

traefik.conf

+
+ +
+ Save + + Reset Configuration + +
+ + @endif + @endisset +
@else