Page MenuHomeDevCentral
Files F3785802

D3292.diff
No OneTemporary
Actions

D3292.diff
View Options

diff --git a/roles/core/motd/files/cloudhugger b/roles/core/motd/files/cloudhugger
--- a/roles/core/motd/files/cloudhugger
+++ b/roles/core/motd/files/cloudhugger
@@ -3,7 +3,7 @@
( ). / .:(` )`. CloudHugger
) _( '`. | :( . )
.=(`( . ) / .-- `. ( ) ) Nasqueron infrastructure
- (( (..__.:'-' /.+( ) ` _` ) ) Production / Debian 10
+ (( (..__.:'-' /.+( ) ` _` ) ) Production / {{ os_info }}
`. `( ) ) / ( . ) ( ) ._
) ` __.:' ) | ( ( )) `-'.-(` ) Kubernetes master
) ) ( ) --' \ `- __.' :( )) Kuma
diff --git a/roles/core/motd/files/complector b/roles/core/motd/files/complector
--- a/roles/core/motd/files/complector
+++ b/roles/core/motd/files/complector
@@ -15,7 +15,7 @@
to Nasqueron Operations SIG members. ! *|'` \|/ \\
Please use dev servers for any other use. ' !o!':\ \\ \
( ('| \ `._______/
- FreeBSD 14 ////\\\,,\///,,,,\,/oO._* o !*!'` `.________/
+ {{ os_info.ljust(16) }} ////\\\,,\///,,,,\,/oO._* o !*!'` `.________/
IP: {{ ipv4_address.ljust(16) }} ---- -- ------- - -oO*OoOo (o''| /
GW: {{ ipv4_gateway.ljust(16) }} -------- ------ 'oO*OoO!*|'o!! \
------- -- - ---- --* oO*OoO *!'| ' /
diff --git a/roles/core/motd/files/db-A-001 b/roles/core/motd/files/db-A-001
--- a/roles/core/motd/files/db-A-001
+++ b/roles/core/motd/files/db-A-001
@@ -1,7 +1,7 @@
____ ______ ___
/ )/ \/ \ db-A-001.nasqueron.drake
( / __ _\ )
- \ (/ o) ( o) ) IP: {{ ipv4_address.ljust(16) }} OS: FreeBSD 14
+ \ (/ o) ( o) ) IP: {{ ipv4_address.ljust(16) }} OS: {{ os_info }}
\_ (_ ) \ ) / GW: {{ ipv4_gateway.ljust(16) }} Cluster A | PostgreSQL
\ /\_/ \)_/
\/ //| |\\ This server hosts databases for Nasqueron projects.
diff --git a/roles/core/motd/files/db-B-001 b/roles/core/motd/files/db-B-001
--- a/roles/core/motd/files/db-B-001
+++ b/roles/core/motd/files/db-B-001
@@ -1,7 +1,7 @@
____
.-' `'. db-B-001.nasqueron.drake
/ _ _\
- | ,_(o\ /o)_ IP: {{ ipv4_address.ljust(16) }} OS: FreeBSD 14
+ | ,_(o\ /o)_ IP: {{ ipv4_address.ljust(16) }} OS: {{ os_info }}
| \` - " - / GW: {{ ipv4_gateway.ljust(16) }} Cluster B | MySQL
| `~`>_<~`
/ ,/ \, This server hosts databases for Nasqueron projects
diff --git a/roles/core/motd/files/hervil b/roles/core/motd/files/hervil
--- a/roles/core/motd/files/hervil
+++ b/roles/core/motd/files/hervil
@@ -1,6 +1,6 @@
)__________ hervil.nasqueron.drake
- .'. `. IP: {{ ipv4_address.ljust(16) }} OS: FreeBSD 14
+ .'. `. IP: {{ ipv4_address.ljust(16) }} OS: {{ os_info }}
| | Hervil |
|_|__________|
| | __..-- This server hosts Mail for Nasqueron projects.
diff --git a/roles/core/motd/files/web-001 b/roles/core/motd/files/web-001
--- a/roles/core/motd/files/web-001
+++ b/roles/core/motd/files/web-001
@@ -1,7 +1,7 @@
H H web-001.nasqueron.drake CNAME: www1.nasqueron.org
| |
- H - C --- C - H IP: {{ ipv4_address.ljust(16) }} OS: FreeBSD 14
+ H - C --- C - H IP: {{ ipv4_address.ljust(16) }} OS: {{ os_info }}
| | GW: {{ ipv4_gateway.ljust(16) }} php-fpm / nginx
H H
Services: Alkane PaaS - MediaWiki SaaS [production]
diff --git a/roles/core/motd/init.sls b/roles/core/motd/init.sls
--- a/roles/core/motd/init.sls
+++ b/roles/core/motd/init.sls
@@ -17,6 +17,7 @@
- context:
ipv4_address: {{ network['ipv4_address'] }}
ipv4_gateway: {{ network['ipv4_gateway'] }}
+ os_info: {{ grains["osfinger"].replace("-", " ") }}
# -------------------------------------------------------------
# Provide a `motd` command to read /etc/motd

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 27, 10:55 (20 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2266741
Default Alt Text
D3292.diff (4 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator