fix(git): GitHub App webhook endpoint defaults to IPv4 instead of the instance domain
This commit is contained in:
parent
21ed8fd300
commit
c3d8f70ebb
2 changed files with 4 additions and 4 deletions
|
|
@ -239,7 +239,7 @@ public function mount()
|
||||||
if (isCloud() && ! isDev()) {
|
if (isCloud() && ! isDev()) {
|
||||||
$this->webhook_endpoint = config('app.url');
|
$this->webhook_endpoint = config('app.url');
|
||||||
} else {
|
} else {
|
||||||
$this->webhook_endpoint = $this->ipv4 ?? '';
|
$this->webhook_endpoint = $this->fqdn ?? $this->ipv4 ?? '';
|
||||||
$this->is_system_wide = $this->github_app->is_system_wide;
|
$this->is_system_wide = $this->github_app->is_system_wide;
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
|
|
|
||||||
|
|
@ -242,15 +242,15 @@ class=""
|
||||||
<div class="flex flex-col sm:flex-row items-start sm:items-end gap-2">
|
<div class="flex flex-col sm:flex-row items-start sm:items-end gap-2">
|
||||||
<x-forms.select wire:model.live='webhook_endpoint' label="Webhook Endpoint"
|
<x-forms.select wire:model.live='webhook_endpoint' label="Webhook Endpoint"
|
||||||
helper="All Git webhooks will be sent to this endpoint. <br><br>If you would like to use domain instead of IP address, set your Coolify instance's FQDN in the Settings menu.">
|
helper="All Git webhooks will be sent to this endpoint. <br><br>If you would like to use domain instead of IP address, set your Coolify instance's FQDN in the Settings menu.">
|
||||||
|
@if ($fqdn)
|
||||||
|
<option value="{{ $fqdn }}">Use {{ $fqdn }}</option>
|
||||||
|
@endif
|
||||||
@if ($ipv4)
|
@if ($ipv4)
|
||||||
<option value="{{ $ipv4 }}">Use {{ $ipv4 }}</option>
|
<option value="{{ $ipv4 }}">Use {{ $ipv4 }}</option>
|
||||||
@endif
|
@endif
|
||||||
@if ($ipv6)
|
@if ($ipv6)
|
||||||
<option value="{{ $ipv6 }}">Use {{ $ipv6 }}</option>
|
<option value="{{ $ipv6 }}">Use {{ $ipv6 }}</option>
|
||||||
@endif
|
@endif
|
||||||
@if ($fqdn)
|
|
||||||
<option value="{{ $fqdn }}">Use {{ $fqdn }}</option>
|
|
||||||
@endif
|
|
||||||
@if (config('app.url'))
|
@if (config('app.url'))
|
||||||
<option value="{{ config('app.url') }}">Use {{ config('app.url') }}</option>
|
<option value="{{ config('app.url') }}">Use {{ config('app.url') }}</option>
|
||||||
@endif
|
@endif
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue