diff --git a/app/Http/Livewire/Settings/Form.php b/app/Http/Livewire/Settings/Form.php index b04084f44..21b5923dd 100644 --- a/app/Http/Livewire/Settings/Form.php +++ b/app/Http/Livewire/Settings/Form.php @@ -15,7 +15,6 @@ class Form extends Component public $do_not_track; public $is_auto_update_enabled; public $is_registration_enabled; - public $is_https_forced; protected $rules = [ 'settings.fqdn' => 'nullable', @@ -28,14 +27,12 @@ class Form extends Component $this->do_not_track = $this->settings->do_not_track; $this->is_auto_update_enabled = $this->settings->is_auto_update_enabled; $this->is_registration_enabled = $this->settings->is_registration_enabled; - $this->is_https_forced = $this->settings->is_https_forced; } public function instantSave() { $this->settings->do_not_track = $this->do_not_track; $this->settings->is_auto_update_enabled = $this->is_auto_update_enabled; $this->settings->is_registration_enabled = $this->is_registration_enabled; - $this->settings->is_https_forced = $this->is_https_forced; $this->settings->save(); $this->emit('saved', 'Settings updated!'); } diff --git a/app/Jobs/InstanceAutoUpdateJob.php b/app/Jobs/InstanceAutoUpdateJob.php index 2e0587533..ff722915d 100644 --- a/app/Jobs/InstanceAutoUpdateJob.php +++ b/app/Jobs/InstanceAutoUpdateJob.php @@ -32,13 +32,15 @@ class InstanceAutoUpdateJob implements ShouldQueue Log::info($this->server); Log::info('Force: ' . $this->force); - if (!$instance_settings->is_auto_update_enabled || !$this->server) { - return $this->delete(); - } - $this->latest_version = get_latest_version_of_coolify(); + Log::info('Latest version: ' . $this->latest_version); $this->current_version = config('version'); + Log::info('Current version: ' . $this->current_version); + if (!$this->force) { + if (!$instance_settings->is_auto_update_enabled || !$this->server) { + return $this->delete(); + } Log::info('Checking if update available'); try { $this->check_if_update_available();