Page MenuHomeDevCentral
Files F3766247

No OneTemporary
Actions

View Options

diff --git a/roles/core/motd/files/cloudhugger b/roles/core/motd/files/cloudhugger
index 22bce97..9f80c23 100644
--- a/roles/core/motd/files/cloudhugger
+++ b/roles/core/motd/files/cloudhugger
@@ -1,13 +1,13 @@
_
(` ). _
( ). / .:(` )`. CloudHugger
) _( '`. | :( . )
.=(`( . ) / .-- `. ( ) ) Nasqueron infrastructure
- (( (..__.:'-' /.+( ) ` _` ) ) Production / Debian 10
+ (( (..__.:'-' /.+( ) ` _` ) ) Production / {{ os_info }}
`. `( ) ) / ( . ) ( ) ._
) ` __.:' ) | ( ( )) `-'.-(` ) Kubernetes master
) ) ( ) --' \ `- __.' :( )) Kuma
.-' (_.' .') `( ) )) Elastic (OpenDistro)
(_ ) ` __.:'
/!\ Only use kubectl
--..,___.--,--'`,---..-.--+--.,,-,,..._.--..-._.-a:f--.
diff --git a/roles/core/motd/files/complector b/roles/core/motd/files/complector
index cb4995c..3363c24 100644
--- a/roles/core/motd/files/complector
+++ b/roles/core/motd/files/complector
@@ -1,24 +1,24 @@
_ _ _____,,,\//,,\\,/,
___ ___ _ __ ___ _ __ | | ___ ___| |_ ___ _ __ /-- --- --- -----
/ __/ _ \| '_ ` _ \| '_ \| |/ _ \/ __| __/ _ \| '__| ///--- --- -- - ----
| (_| (_) | | | | | | |_) | | __/ (__| || (_) | | o////- ---- --- --
\___\___/|_| |_| |_| .__/|_|\___|\___|\__\___/|_| !!//o/--- -- --
|_| o*) !///,~,,\\,\/,,/,//,,
o!*!o'(\ /\
Complector provides deployment services | ! o ",) \/\ /\ / \/\
for Nasqueron servers infrastructure: o !o! !!| \/ \/ /
( * ( o!'; |\ \ /
- Vault o o ! * !` | \ / \
- Salt o | o 'o| | : \ /
* o !*!': |o| / /
Access is restricted for deployment purpose (o''| `| : / /
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 *!'| ' /
“Flow the secrets, the code --- - ----- ---- - oO*OoO!!':o!' /
Straight from the source - - ----- - -- - *--oO*OoOo!` /
The Complector waterfall.” \\\\\,,,\\,//////,\,,\\\/,,,\,,ejm/AMC
diff --git a/roles/core/motd/files/db-A-001 b/roles/core/motd/files/db-A-001
index 3222c4c..ea3fdbb 100644
--- a/roles/core/motd/files/db-A-001
+++ b/roles/core/motd/files/db-A-001
@@ -1,9 +1,9 @@
____ ______ ___
/ )/ \/ \ 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.
v | | v Use stricly Salt to configure any database or access.
\__/
diff --git a/roles/core/motd/files/db-B-001 b/roles/core/motd/files/db-B-001
index 2a9a824..79b60b7 100644
--- a/roles/core/motd/files/db-B-001
+++ b/roles/core/motd/files/db-B-001
@@ -1,10 +1,10 @@
____
.-' `'. 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
\ \`. ,'/ and our Alkane platform. Additionally, it serves
'-._``\___/''-.._ as a repository for databases we have inherited
`--..,___.-' and continue to support on this cluster.
diff --git a/roles/core/motd/files/hervil b/roles/core/motd/files/hervil
index fbb47a8..929e61a 100644
--- a/roles/core/motd/files/hervil
+++ b/roles/core/motd/files/hervil
@@ -1,14 +1,14 @@
)__________ 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.
__| |--""
__..---""" | |
|\ | | www
| \ | |. )_(
\ \ \|/ | |. \|/
\ \ |__\|/. \\|
\ \ jro+jgs _\V/_
diff --git a/roles/core/motd/files/web-001 b/roles/core/motd/files/web-001
index 4e949c1..1faa328 100644
--- 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
index bcb0028..a3d736b 100644
--- a/roles/core/motd/init.sls
+++ b/roles/core/motd/init.sls
@@ -1,58 +1,59 @@
# -------------------------------------------------------------
# Salt — MOTD
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# Created: 2016-04-10
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
{% set motd_path = salt['motd.get_path']() %}
{% set network = salt['node.resolve_network']() %}
motd:
file.managed:
- name: {{ motd_path }}
- source: salt://roles/core/motd/files/{{ grains['id'] }}
- template: jinja
- context:
ipv4_address: {{ network['ipv4_address'] }}
ipv4_gateway: {{ network['ipv4_gateway'] }}
+ os_info: {{ grains["osfinger"].replace("-", " ") }}
# -------------------------------------------------------------
# Provide a `motd` command to read /etc/motd
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/usr/local/bin/motd:
file.managed:
- source: salt://roles/core/motd/files/motd.sh
- mode: 755
{% if motd_path != "/etc/motd" %}
/etc/motd:
file.symlink:
- target: {{ motd_path }}
{% endif %}
# -------------------------------------------------------------
# Scaleway instances
#
# Fixes T858.
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
get_rid_of_scaleway_motd:
file.absent:
- name: /etc/update-motd.d/50-scw
# -------------------------------------------------------------
# Generate MOTD from templates
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% if grains['os_family'] == 'FreeBSD' and grains['osmajorrelease'] >= 13 %}
update_motd:
cmd.run:
- name: service motd restart
- onchanges:
- file: motd
{% endif %}

File Metadata

Mime Type
text/x-diff
Expires
Sun, Nov 24, 17:17 (41 m, 10 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2258514
Default Alt Text
(8 KB)

Event Timeline

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