Skip to content

Commit

Permalink
More housekeeping
Browse files Browse the repository at this point in the history
  • Loading branch information
@getpinga
getpinga committed Feb 12, 2025
1 parent 715ba78 commit de261bd
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 16 deletions.
4 changes: 3 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ After installation, be sure to review all the guides in the Documentation sectio

### Update

If your current version is not immediately before the latest, you must run the update scripts sequentially for each version, e.g., from 1.0.3 to 1.0.4, then from 1.0.4 to 1.0.5, and so on, until you reach the latest version.
You must run update scripts in order, without skipping versions. For example, if you're on 1.0.13 and the latest is 1.0.15, first update to 1.0.14, then to 1.0.15.

- v1.0.14 to v1.0.15 - backup registry, download and run the [update1015.sh](docs/update1015.sh) script.

- v1.0.13 to v1.0.14 - backup registry, download and run the [update1014.sh](docs/update1014.sh) script.

Expand Down
4 changes: 3 additions & 1 deletion cp/app/Controllers/ReportsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,15 @@ public function serverHealth(Request $request, Response $response)

return "Log file not found: $logFile";
};

// Check statuses
$eppStatus = $checkServiceStatus('epp');
$whoisStatus = $checkServiceStatus('whois');
$rdapStatus = $checkServiceStatus('rdap');
$dasStatus = $checkServiceStatus('das');
$msgbStatus = $checkServiceStatus('msg_producer');
$msgwStatus = $checkServiceStatus('msg_worker');
$redisStatus = $checkServiceStatus('redis');

// Get log lines as strings
$eppLogs = $getLogLines('epp');
Expand Down Expand Up @@ -213,6 +214,7 @@ public function serverHealth(Request $request, Response $response)
'msgwStatus' => $msgwStatus,
'msgbLogs' => $msgbLogs,
'msgwLogs' => $msgwLogs,
'redisStatus' => $redisStatus
]);
}

Expand Down
40 changes: 28 additions & 12 deletions cp/resources/views/admin/reports/serverHealth.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
</div>

<!-- EPP Card -->
<div class="col-md-4">
<div class="col-md-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center flex-wrap">
Expand All @@ -122,14 +122,14 @@
<span class="status-dot status-dot-animated"></span>
{{ eppStatus == 'Running' ? __('Running') : __('Stopped') }}
</span>
<div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service epp restart</code></div>
<div class="w-100 mt-2 text-secondary">{{ __('Problem? Restart:') }} <code>service epp restart</code></div>
</div>
</div>
</div>
</div>

<!-- RDAP Card -->
<div class="col-md-4">
<div class="col-md-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center flex-wrap">
Expand All @@ -138,14 +138,14 @@
<span class="status-dot status-dot-animated"></span>
{{ rdapStatus == 'Running' ? __('Running') : __('Stopped') }}
</span>
<div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service rdap restart</code></div>
<div class="w-100 mt-2 text-secondary">{{ __('Problem? Restart:') }} <code>service rdap restart</code></div>
</div>
</div>
</div>
</div>

<!-- WHOIS Card -->
<div class="col-md-4">
<div class="col-md-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center flex-wrap">
Expand All @@ -154,14 +154,14 @@
<span class="status-dot status-dot-animated"></span>
{{ whoisStatus == 'Running' ? __('Running') : __('Stopped') }}
</span>
<div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service whois restart</code></div>
<div class="w-100 mt-2 text-secondary">{{ __('Problem? Restart:') }} <code>service whois restart</code></div>
</div>
</div>
</div>
</div>

<!-- DAS Card -->
<div class="col-md-4">
<div class="col-md-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center flex-wrap">
Expand All @@ -170,14 +170,14 @@
<span class="status-dot status-dot-animated"></span>
{{ dasStatus == 'Running' ? __('Running') : __('Stopped') }}
</span>
<div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service das restart</code></div>
<div class="w-100 mt-2 text-secondary">{{ __('Problem? Restart:') }} <code>service das restart</code></div>
</div>
</div>
</div>
</div>

<!-- Msg_Producer Card -->
<div class="col-md-4">
<div class="col-md-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center flex-wrap">
Expand All @@ -186,14 +186,14 @@
<span class="status-dot status-dot-animated"></span>
{{ msgbStatus == 'Running' ? __('Running') : __('Stopped') }}
</span>
<div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service msg_producer restart</code></div>
<div class="w-100 mt-2 text-secondary">{{ __('Problem? Restart:') }} <code>service msg_producer restart</code></div>
</div>
</div>
</div>
</div>

<!-- Msg_Worker Card -->
<div class="col-md-4">
<div class="col-md-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center flex-wrap">
Expand All @@ -202,7 +202,23 @@
<span class="status-dot status-dot-animated"></span>
{{ msgwStatus == 'Running' ? __('Running') : __('Stopped') }}
</span>
<div class="w-100 mt-2 text-secondary">{{ __('Issue detected? Restart with:') }} <code>service msg_worker restart</code></div>
<div class="w-100 mt-2 text-secondary">{{ __('Problem? Restart:') }} <code>service msg_worker restart</code></div>
</div>
</div>
</div>
</div>

<!-- Redis Card -->
<div class="col-md-3">
<div class="card">
<div class="card-body">
<div class="d-flex align-items-center flex-wrap">
<div class="subheader me-2">{{ __('Redis') }}:</div>
<span class="status {{ redisStatus == 'Running' ? 'status-green' : 'status-red' }}">
<span class="status-dot status-dot-animated"></span>
{{ redisStatus == 'Running' ? __('Running') : __('Stopped') }}
</span>
<div class="w-100 mt-2 text-secondary">{{ __('Problem? Restart:') }} <code>service redis restart</code></div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion cp/resources/views/partials/footer.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<a href="https://namingo.org" target="_blank" class="link-secondary" rel="noopener">Namingo</a>
</li>
<li class="list-inline-item">
v1.0.14
v1.0.15
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ EOF
wget "http://www.adminer.org/latest.php" -O /usr/share/adminer/latest.php
ln -s /usr/share/adminer/latest.php /usr/share/adminer/adminer.php

git clone --branch v1.0.14 --single-branch https://github.com/getnamingo/registry /opt/registry
git clone --branch v1.0.15 --single-branch https://github.com/getnamingo/registry /opt/registry
mkdir -p /var/log/namingo
chown -R www-data:www-data /var/log/namingo

Expand Down

0 comments on commit de261bd

Please sign in to comment.