bbs/clrghouz
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: bbs:7ba037b76dd8b013c103862d9fbc132b6d65b3d9
Branches Tags
bbs:master
bbs:bbs
...
compare: bbs:676ba4a40bd8023d8308f94b0225c0ad1ab6da15
Branches Tags
bbs:master
bbs:bbs

2 Commits
7ba037b76d ... 676ba4a40b

Author SHA1 Message Date
Deon George
676ba4a40b Presentation fixes, no functional changes
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 34s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m49s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s
Details
2024-10-20 11:49:52 +11:00
Deon George
432a9bbf2b Fix working out our hostname when we are an RC 2024-10-20 11:49:34 +11:00
4 changed files with 5 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
app/Classes/Dynamic/NodelistSegment.php
View File

@ -59,7 +59,7 @@ class NodelistSegment extends Dynamic
$result->push('CM'); $result->push('CM');
if ($ao->system->address) { if ($ao->system->address) {
$result->push(sprintf('INA:%s',$ao->system->address)); $result->push(sprintf('INA:%s',our_address($ao->domain)->contains($ao->id) ? our_hostname($ao) : $ao->system->address));
if (($x=$ao->system->mailers->pluck('name')->search('BINKP')) !== FALSE) if (($x=$ao->system->mailers->pluck('name')->search('BINKP')) !== FALSE)
$result->push(sprintf('IBN%s',(($y=$ao->system->mailers->get($x)->pivot->port) !== 24554) ? ':'.$y : '')); $result->push(sprintf('IBN%s',(($y=$ao->system->mailers->get($x)->pivot->port) !== 24554) ? ':'.$y : ''));

2
app/Http/Requests/AddressMerge.php
View File

@ -36,7 +36,7 @@ class AddressMerge extends FormRequest
$src = Address::withTrashed()->findOrFail($request->src); $src = Address::withTrashed()->findOrFail($request->src);
if ((! $dst->active) && ($dst->system_id !== $src->system_id) && ($src->system->name !== System::default)) if ((! $dst->active) && ($dst->system_id !== $src->system_id) && ($src->system->name !== System::default))
$fail('Destination must be active, or be from the system system'); $fail('Destination must be active, or be from the same system');
}, },
function ($attribute,$value,$fail) use ($request) { function ($attribute,$value,$fail) use ($request) {
$dst = Address::withTrashed()->findOrFail($value); $dst = Address::withTrashed()->findOrFail($value);

3
app/helpers.php
View File

@ -100,7 +100,7 @@ function our_address(Domain|Address $o=NULL): Collection|Address|NULL
$our = Cache::remember(sprintf('%d-akas',$so->system_id),60,function() use ($so) { $our = Cache::remember(sprintf('%d-akas',$so->system_id),60,function() use ($so) {
$so->load([ $so->load([
'system:id,name', 'system:id,name',
'system.akas:addresses.id,addresses.zone_id,host_id,node_id,point_id,addresses.system_id,addresses.active,role', 'system.akas:addresses.id,addresses.zone_id,region_id,host_id,node_id,point_id,addresses.system_id,addresses.active,role',
'system.akas.zone:id,domain_id,zone_id', 'system.akas.zone:id,domain_id,zone_id',
'system.akas.zone.domain:id,name', 'system.akas.zone.domain:id,name',
]); ]);
@ -150,6 +150,7 @@ function our_hostname(Address $o): string
->prepend(sprintf('z%d',$our->zone->zone_id)); ->prepend(sprintf('z%d',$our->zone->zone_id));
break; break;
case Address::NODE_RC:
case Address::NODE_NC: case Address::NODE_NC:
$domain = collect(explode('.',gethostname()))->forget(0) $domain = collect(explode('.',gethostname()))->forget(0)
->prepend(sprintf('z%d',$our->zone->zone_id)) ->prepend(sprintf('z%d',$our->zone->zone_id))

2
resources/views/dashboard.blade.php
View File

@ -35,7 +35,7 @@ $user->load(['systems.akas.zone.domain.echoareas','systems.akas.echoareas']);
<!-- {{ $x=$list->first()->domain->name }} --> <!-- {{ $x=$list->first()->domain->name }} -->
<div class="accordion-item"> <div class="accordion-item">
<h3 class="accordion-header"> <h3 class="accordion-header">
<span class="accordion-button" id="hd_{{ $x }}" data-bs-toggle="collapse" data-bs-target="#collapse_{{ $x }}" aria-expanded="true" aria-controls="collapse_{{ $x }}">{{ $x }}</span> <span @class(['accordion-button','collapsed'=>$loop->index]) id="hd_{{ $x }}" data-bs-toggle="collapse" data-bs-target="#collapse_{{ $x }}" aria-expanded="true" aria-controls="collapse_{{ $x }}">{{ $x }}</span>
</h3> </h3>
<div id="collapse_{{ $x }}" class="accordion-collapse {{ ($loop->index) ? 'collapse' : 'show' }}" aria-labelledby="{{ $x }}" data-bs-parent="#accordion_details"> <div id="collapse_{{ $x }}" class="accordion-collapse {{ ($loop->index) ? 'collapse' : 'show' }}" aria-labelledby="{{ $x }}" data-bs-parent="#accordion_details">