use one constants file

2024-11-12 15:18:48 +01:00
parent 442b0e837c
commit 1c5ddab30d
29 changed files with 30 additions and 30 deletions
--- a/app/Actions/Server/CleanupDocker.php
+++ b/app/Actions/Server/CleanupDocker.php
@@ -13,7 +13,7 @@ class CleanupDocker
    {
        $settings = instanceSettings();
        $helperImageVersion = data_get($settings, 'helper_version');
-        $helperImage = config('coolify.helper_image');
+        $helperImage = config('constants.coolify.helper_image');
        $helperImageWithVersion = "$helperImage:$helperImageVersion";

        $commands = [
--- a/app/Actions/Server/StartLogDrain.php
+++ b/app/Actions/Server/StartLogDrain.php
@@ -169,7 +169,7 @@ Files:
 ');
            $license_key = $server->settings->logdrain_newrelic_license_key;
            $base_uri = $server->settings->logdrain_newrelic_base_uri;
-            $base_path = config('coolify.base_config_path');
+            $base_path = config('constants.coolify.base_config_path');

            $config_path = $base_path.'/log-drains';
            $fluent_bit_config = $config_path.'/fluent-bit.conf';
--- a/app/Console/Commands/Horizon.php
+++ b/app/Console/Commands/Horizon.php
@@ -12,7 +12,7 @@ class Horizon extends Command

    public function handle()
    {
-        if (config('coolify.is_horizon_enabled')) {
+        if (config('constants.horizon.is_horizon_enabled')) {
            $this->info('Horizon is enabled. Starting.');
            $this->call('horizon');
            exit(0);
--- a/app/Console/Commands/Scheduler.php
+++ b/app/Console/Commands/Scheduler.php
@@ -12,7 +12,7 @@ class Scheduler extends Command

    public function handle()
    {
-        if (config('coolify.is_scheduler_enabled')) {
+        if (config('constants.horizon.is_scheduler_enabled')) {
            $this->info('Scheduler is enabled. Starting.');
            $this->call('schedule:work');
            exit(0);
--- a/app/Helpers/SshMultiplexingHelper.php
+++ b/app/Helpers/SshMultiplexingHelper.php
@@ -151,7 +151,7 @@ class SshMultiplexingHelper

    private static function isMultiplexingEnabled(): bool
    {
-        return config('constants.ssh.mux_enabled') && ! config('coolify.is_windows_docker_desktop');
+        return config('constants.ssh.mux_enabled') && ! config('constants.coolify.is_windows_docker_desktop');
    }

    private static function validateSshKey(string $sshKeyLocation): void
--- a/app/Http/Controllers/Api/OtherController.php
+++ b/app/Http/Controllers/Api/OtherController.php
@@ -147,7 +147,7 @@ class OtherController extends Controller
    public function feedback(Request $request)
    {
        $content = $request->input('content');
-        $webhook_url = config('coolify.feedback_discord_webhook');
+        $webhook_url = config('constants.webhooks.feedback_discord_webhook');
        if ($webhook_url) {
            Http::post($webhook_url, [
                'content' => $content,
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -1323,7 +1323,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
    private function prepare_builder_image()
    {
        $settings = instanceSettings();
-        $helperImage = config('coolify.helper_image');
+        $helperImage = config('constants.coolify.helper_image');
        $helperImage = "{$helperImage}:{$settings->helper_version}";
        // Get user home directory
        $this->serverUserHomeDir = instant_remote_process(['echo $HOME'], $this->server);
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -524,7 +524,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
    private function getFullImageName(): string
    {
        $settings = instanceSettings();
-        $helperImage = config('coolify.helper_image');
+        $helperImage = config('constants.coolify.helper_image');
        $latestVersion = $settings->helper_version;

        return "{$helperImage}:{$latestVersion}";
--- a/app/Jobs/PullHelperImageJob.php
+++ b/app/Jobs/PullHelperImageJob.php
@@ -20,7 +20,7 @@ class PullHelperImageJob implements ShouldBeEncrypted, ShouldQueue

    public function handle(): void
    {
-        $helperImage = config('coolify.helper_image');
+        $helperImage = config('constants.coolify.helper_image');
        $latest_version = instanceSettings()->helper_version;
        instant_remote_process(["docker pull -q {$helperImage}:{$latest_version}"], $this->server, false);
    }
--- a/app/Livewire/Waitlist/Index.php
+++ b/app/Livewire/Waitlist/Index.php
@@ -27,7 +27,7 @@ class Index extends Component

    public function mount()
    {
-        if (config('coolify.waitlist') == false) {
+        if (config('constants.waitlist.enabled') == false) {
            return redirect()->route('register');
        }
        $this->waitingInLine = Waitlist::whereVerified(true)->count();
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -462,7 +462,7 @@ $schema://$host {

    public function proxyPath()
    {
-        $base_path = config('coolify.base_config_path');
+        $base_path = config('constants.coolify.base_config_path');
        $proxyType = $this->proxyType();
        $proxy_path = "$base_path/proxy";
        // TODO: should use /traefik for already exisiting configurations?
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -1171,7 +1171,7 @@ class Service extends BaseModel
        $services = get_service_templates();
        $service = data_get($services, str($this->name)->beforeLast('-')->value, []);

-        return data_get($service, 'documentation', config('constants.docs.base_url'));
+        return data_get($service, 'documentation', config('constants.urls.docs'));
    }

    public function applications()
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -172,7 +172,7 @@ class Team extends Model implements SendsDiscord, SendsEmail
    {
        return Attribute::make(
            get: function () {
-                if (config('coolify.self_hosted') || $this->id === 0) {
+                if (config('constants.coolify.self_hosted') || $this->id === 0) {
                    $subscription = 'self-hosted';
                } else {
                    $subscription = data_get($this, 'subscription');
--- a/app/Providers/FortifyServiceProvider.php
+++ b/app/Providers/FortifyServiceProvider.php
@@ -50,7 +50,7 @@ class FortifyServiceProvider extends ServiceProvider
            if (! $settings->is_registration_enabled) {
                return redirect()->route('login');
            }
-            if (config('coolify.waitlist')) {
+            if (config('constants.waitlist.enabled')) {
                return redirect()->route('waitlist.index');
            } else {
                return view('auth.register', [
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -359,7 +359,7 @@ function isDev(): bool

 function isCloud(): bool
 {
-    return ! config('coolify.self_hosted');
+    return ! config('constants.coolify.self_hosted');
 }

 function translate_cron_expression($expression_to_validate): string
--- a/database/seeders/ProductionSeeder.php
+++ b/database/seeders/ProductionSeeder.php
@@ -100,7 +100,7 @@ class ProductionSeeder extends Seeder
            }
        }

-        if (! isCloud() && config('coolify.is_windows_docker_desktop') == false) {
+        if (! isCloud() && config('constants.coolify.is_windows_docker_desktop') == false) {
            $coolify_key_name = '@host.docker.internal';
            $ssh_keys_directory = Storage::disk('ssh-keys')->files();
            $coolify_key = collect($ssh_keys_directory)->firstWhere(fn ($item) => str($item)->contains($coolify_key_name));
@@ -127,7 +127,7 @@ class ProductionSeeder extends Seeder
                }
            }
        }
-        if (config('coolify.is_windows_docker_desktop')) {
+        if (config('constants.coolify.is_windows_docker_desktop')) {
            PrivateKey::updateOrCreate(
                [
                    'id' => 0,
--- a/resources/views/auth/forgot-password.blade.php
+++ b/resources/views/auth/forgot-password.blade.php
@@ -18,7 +18,7 @@
                @else
                    <div>Transactional emails are not active on this instance.</div>
                    <div>See how to set it in our <a class="dark:text-white" target="_blank"
-                            href="{{ config('constants.docs.base_url') }}">docs</a>, or how to
+                            href="{{ config('constants.urls.docs') }}">docs</a>, or how to
                        manually reset password.
                    </div>
                @endif
--- a/resources/views/components/pricing-plans.blade.php
+++ b/resources/views/components/pricing-plans.blade.php
@@ -262,7 +262,7 @@
                    your self-hosted instance?
                    <x-forms.button>
                        <a class="font-bold dark:text-white hover:no-underline"
-                            href="{{ config('coolify.contact') }}">Contact
+                            href="{{ config('constants.urls.contact') }}">Contact
                            Us</a>
                    </x-forms.button>
                </div>
--- a/resources/views/errors/400.blade.php
+++ b/resources/views/errors/400.blade.php
@@ -14,7 +14,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/401.blade.php
+++ b/resources/views/errors/401.blade.php
@@ -9,7 +9,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/402.blade.php
+++ b/resources/views/errors/402.blade.php
@@ -8,7 +8,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -9,7 +9,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -10,7 +10,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/419.blade.php
+++ b/resources/views/errors/419.blade.php
@@ -10,7 +10,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/429.blade.php
+++ b/resources/views/errors/429.blade.php
@@ -10,7 +10,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -13,7 +13,7 @@
            <a href="/">
                <x-forms.button>Go back home</x-forms.button>
            </a>
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -7,7 +7,7 @@
            patience.
        </p>
        <div class="flex items-center mt-10 gap-x-6">
-            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+            <a target="_blank" class="text-xs" href="{{ config('constants.urls.contact') }}">Contact
                support
                <x-external-link />
            </a>
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -254,7 +254,7 @@
                const name = @js($name);
                const isDev = @js(config('app.env')) ===
                    'local';
-                const devWebhook = @js(config('coolify.dev_webhook'));
+                const devWebhook = @js(config('constants.webhooks.dev_webhook'));
                if (isDev && devWebhook) {
                    baseUrl = devWebhook;
                }
--- a/resources/views/livewire/subscription/actions.blade.php
+++ b/resources/views/livewire/subscription/actions.blade.php
@@ -45,7 +45,7 @@
            </div>
        </div>
        <div class="pt-4">
-            If you have any problems, please <a class="underline dark:text-white" href="{{ config('coolify.contact') }}"
+            If you have any problems, please <a class="underline dark:text-white" href="{{ config('constants.urls.contact') }}"
                target="_blank">contact us.</a>
        </div>
    @endif