Compare commits

..

2 commits

Author SHA1 Message Date
bb609dedd1 fix(dns): replace Cloudflare defaults with CIRA Canadian Shield
All checks were successful
Build MapleDeploy Coolify Image / build (push) Successful in 34s
Replace hardcoded 1.1.1.1/1.0.0.1 (Cloudflare) DNS defaults with
CIRA Canadian Shield (149.112.121.10, 149.112.122.10) to maintain
Canadian data sovereignty for DNS resolution.
2026-02-19 16:42:04 -08:00
68a99a3cf2 chore(branding): remove sponsorship popup remnants 2026-02-19 16:37:45 -08:00
6 changed files with 9 additions and 21 deletions

View file

@ -28,8 +28,7 @@ class Advanced extends Component
public ?string $allowed_ips = null;
#[Validate('boolean')]
public bool $is_sponsorship_popup_enabled;
// MapleDeploy branding: is_sponsorship_popup_enabled removed (popup removed)
#[Validate('boolean')]
public bool $disable_two_step_confirmation;
@ -46,7 +45,6 @@ public function rules()
'custom_dns_servers' => 'nullable|string',
'is_api_enabled' => 'boolean',
'allowed_ips' => ['nullable', 'string', new ValidIpOrCidr],
'is_sponsorship_popup_enabled' => 'boolean',
'disable_two_step_confirmation' => 'boolean',
'is_wire_navigate_enabled' => 'boolean',
];
@ -65,7 +63,6 @@ public function mount()
$this->is_dns_validation_enabled = $this->settings->is_dns_validation_enabled;
$this->is_api_enabled = $this->settings->is_api_enabled;
$this->disable_two_step_confirmation = $this->settings->disable_two_step_confirmation;
$this->is_sponsorship_popup_enabled = $this->settings->is_sponsorship_popup_enabled;
$this->is_wire_navigate_enabled = $this->settings->is_wire_navigate_enabled ?? true;
}
@ -143,7 +140,6 @@ public function instantSave()
$this->settings->custom_dns_servers = $this->custom_dns_servers;
$this->settings->is_api_enabled = $this->is_api_enabled;
$this->settings->allowed_ips = $this->allowed_ips;
$this->settings->is_sponsorship_popup_enabled = $this->is_sponsorship_popup_enabled;
$this->settings->disable_two_step_confirmation = $this->disable_two_step_confirmation;
$this->settings->is_wire_navigate_enabled = $this->is_wire_navigate_enabled;
$this->settings->save();

View file

@ -3,7 +3,7 @@
return [
// MapleDeploy branding: registry pointed to Forgejo, auto-update disabled by default
'coolify' => [
'version' => '4.0.0-beta.463.7',
'version' => '4.0.0-beta.463.9',
'helper_version' => '1.0.12',
'realtime_version' => '1.0.10',
'self_hosted' => env('SELF_HOSTED', true),

View file

@ -13,7 +13,7 @@ public function up(): void
{
Schema::table('instance_settings', function (Blueprint $table) {
$table->boolean('is_dns_validation_enabled')->default(true);
$table->string('custom_dns_servers')->nullable()->default('1.1.1.1');
$table->string('custom_dns_servers')->nullable()->default('149.112.121.10,149.112.122.10');
});
}

View file

@ -1,12 +1,10 @@
<div x-data="{
popups: {
sponsorship: true,
notification: true,
realtime: false,
},
isDevelopment: {{ isDev() ? 'true' : 'false' }},
init() {
this.popups.sponsorship = this.shouldShowMonthlyPopup('popupSponsorship');
this.popups.notification = this.shouldShowMonthlyPopup('popupNotification');
this.popups.realtime = localStorage.getItem('popupRealtime');
@ -135,10 +133,7 @@ class="underline dark:text-white">/subscription</a> to update your subscription
</span>
@endif
<script>
function disableSponsorship() {
// Store current timestamp instead of just 'false'
localStorage.setItem('popupSponsorship', Date.now().toString());
}
// MapleDeploy branding: disableSponsorship() removed (popup removed)
function disableNotification() {
// Store current timestamp instead of just 'false'

View file

@ -34,8 +34,8 @@ class="flex flex-col h-full gap-8 sm:flex-row">
</div>
<x-forms.input id="custom_dns_servers" label="Custom DNS Servers"
helper="Custom DNS servers for domain validation. Comma-separated list (e.g., 1.1.1.1,8.8.8.8). Leave empty to use system defaults."
placeholder="1.1.1.1,8.8.8.8" />
helper="Custom DNS servers for domain validation. Comma-separated list (e.g., 149.112.121.10,149.112.122.10). Leave empty to use system defaults."
placeholder="149.112.121.10,149.112.122.10" />
<h4 class="pt-4">API Settings</h4>
<div class="md:w-96">
<x-forms.checkbox instantSave id="is_api_enabled" label="API Access"
@ -55,11 +55,8 @@ class="flex flex-col h-full gap-8 sm:flex-row">
<x-forms.checkbox instantSave id="is_wire_navigate_enabled" label="SPA Navigation"
helper="Enable single-page application (SPA) style navigation with prefetching on hover. When enabled, page transitions are smoother without full page reloads and pages are prefetched when hovering over links. Disable if you experience navigation issues." />
</div>
{{-- MapleDeploy branding: sponsorship popup checkbox removed (popup itself already removed) --}}
<h4 class="pt-4">Confirmation Settings</h4>
<div class="md:w-96">
<x-forms.checkbox instantSave id="is_sponsorship_popup_enabled" label="Show Sponsorship Popup"
helper="Show monthly sponsorship reminders. Disable to hide these messages permanently." />
</div>
</div>
<div class="flex flex-col gap-1">
@if ($disable_two_step_confirmation)

View file

@ -182,8 +182,8 @@ services:
network:
interface: 172.28.0.1
dns:
- 1.1.1.1
- 1.0.0.1
- 149.112.121.10
- 149.112.122.10
name: pterodactyl_nw
ispn: false
driver: bridge