Page MenuHomeDevCentral
Files F25214048

D4048.diff
No OneTemporary
Actions

D4048.diff
View Options

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
@@ -16,7 +16,7 @@
Please use dev servers for any other use. ' !o!':\ \\ \
( ('| \ `._______/
{{ os_info.ljust(16) }} ////\\\,,\///,,,,\,/oO._* o !*!'` `.________/
- IP: {{ ipv4_address.ljust(16) }} ---- -- ------- - -oO*OoOo (o''| /
+ IP: {{ ipv4.ljust(16) }} ---- -- ------- - -oO*OoOo (o''| /
GW: {{ ipv4_gateway.ljust(16) }} -------- ------ 'oO*OoO!*|'o!! \
------- -- - ---- --* oO*OoO *!'| ' /
“Flow the secrets, the code --- - ----- ---- - oO*OoO!!':o!' /
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: {{ os_info }}
+ \ (/ o) ( o) ) IP: {{ ipv4.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,9 +1,9 @@
____
.-' `'. db-b-001.nasqueron.drake
/ _ _\
- | ,_(o\ /o)_ IP: {{ ipv4_address.ljust(16) }} OS: {{ os_info }}
+ | ,_(o\ /o)_ IP: {{ ipv4.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
diff --git a/roles/core/motd/files/dns-001 b/roles/core/motd/files/dns-001
--- a/roles/core/motd/files/dns-001
+++ b/roles/core/motd/files/dns-001
@@ -1,20 +1,19 @@
- ____ _ _ ____ ___ ___ _
-| _ \| \ | / ___| / _ \ / _ \/ |
-| | | | \| \___ \ _____| | | | | | | |
-| |_| | |\ |___) |_____| |_| | |_| | |
-|____/|_| \_|____/ \___/ \___/|_|
-
- ___________________________
- / /|
- /__________________________/ |
- | | |
- | ┌─────────────────────┐ | |
- | │ DNS-001 │ | |
- | │---------------------│ | |
- | │ local: 172.27.27.2 │ | |
- | │ public:178.32.70.109│ | |
- | │---------------------│ | |
- | │ │ | |
- | │ │ | |
- | └─────────────────────┘ | |
- |___________________________|/
+ .--------------------------------------------.
+ / .____ _ _ ____ ___ ___ _ /|
+ / | _ \| \ | / ___| / _ \ / _ \/ | / |
+ / | | | | \| \___ \ ____| | | | | | | | / |
+ /| | |_| | |\ |___) |____| |_| | |_| | | / |
+ / | |____/|_| \_|____/ \___/ \___/|_| / |
+ / | / |
+ *---+----------------------------------------* |
+ | | [ ns1.nasqueron.org ] | |
+ | |----------------------------------------| |
+ | | local: {{ private_ipv4.ljust(16) }} | |
+ | | public: {{ ipv4.ljust(16) }} | |
+ | |----------------------------------------| |
+ | | status: production | /
+ | | forest: nasqueron-infra | /
+ | |----------------------------------------| /
+ | / A Nasqueron infrastructure server. | /
+ | / DNS resolver powered by Knot. | /
+ |/___________________________________________|/
diff --git a/roles/core/motd/files/docker-002 b/roles/core/motd/files/docker-002
--- a/roles/core/motd/files/docker-002
+++ b/roles/core/motd/files/docker-002
@@ -1,7 +1,7 @@
docker-002 ______
\ \
- A Nasqueron infra- \ \ IP: {{ ipv4_address }}
+ A Nasqueron infra- \ \ IP: {{ ipv4 }}
structure server. \ \_ GW: {{ ipv4_gateway }}
_\ \
PaaS Docker \ \
diff --git a/roles/core/motd/files/dwellers b/roles/core/motd/files/dwellers
--- a/roles/core/motd/files/dwellers
+++ b/roles/core/motd/files/dwellers
@@ -6,7 +6,7 @@
|| || \\/\// ||..|| || || ||..|| || `'')
.||...|' \/\/ `|... .||. .||. `|... .||. `...'
- IP: {{ ipv4_address }}
+ IP: {{ ipv4 }}
GW: {{ ipv4_gateway }}
Containers for Nasqueron and associated projects.
diff --git a/roles/core/motd/files/equatower b/roles/core/motd/files/equatower
--- a/roles/core/motd/files/equatower
+++ b/roles/core/motd/files/equatower
@@ -1,7 +1,7 @@
EQUATOWER ______
\ \
- A Nasqueron infra- \ \ IP: {{ ipv4_address }}
+ A Nasqueron infra- \ \ IP: {{ ipv4 }}
structure server. \ \_ GW: {{ ipv4_gateway }}
_\ \
PaaS Docker \ \
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,14 +1,13 @@
)__________ hervil.nasqueron.drake
- .'. `. IP: {{ ipv4_address.ljust(16) }} OS: {{ os_info }}
+ .'. `. IP: {{ ipv4.ljust(16) }} OS: {{ os_info }}
| | Hervil |
|_|__________|
| | __..-- This server hosts Mail for Nasqueron projects.
- __| |--""
+ __| |--""
__..---""" | |
|\ | | www
| \ | |. )_(
\ \ \|/ | |. \|/
\ \ |__\|/. \\|
\ \ jro+jgs _\V/_
-
diff --git a/roles/core/motd/files/router-001 b/roles/core/motd/files/router-001
--- a/roles/core/motd/files/router-001
+++ b/roles/core/motd/files/router-001
@@ -1,7 +1,7 @@
router-001 ______
\ \ IP: 172.27.27.1
- A Nasqueron infra- \ \ IP: {{ ipv4_address }}
+ A Nasqueron infra- \ \ IP: {{ ipv4 }}
structure server. \ \_ GW: {{ ipv4_gateway }}
_\ \
Drake network router \ \
diff --git a/roles/core/motd/files/router-002 b/roles/core/motd/files/router-002
--- a/roles/core/motd/files/router-002
+++ b/roles/core/motd/files/router-002
@@ -1,7 +1,7 @@
router-002 ______
- \ \
- A Nasqueron infra- \ \ IP: {{ ipv4_address }}
+ \ \
+ A Nasqueron infra- \ \ IP: {{ ipv4 }}
structure server. \ \_ GW: {{ ipv4_gateway }}
_\ \
Drake network router \ \
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: {{ os_info }}
+ H - C --- C - H IP: {{ ipv4.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
@@ -15,7 +15,8 @@
- source: salt://roles/core/motd/files/{{ grains['id'] }}
- template: jinja
- context:
- ipv4_address: {{ network['ipv4_address'] }}
+ ipv4: {{ network['ipv4_address'] }}
+ private_ipv4: {{ network['private_ipv4_address'] }}
ipv4_gateway: {{ network['ipv4_gateway'] }}
os_info: {{ grains["osfinger"].replace("-", " ") }}

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 6, 13:23 (10 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3599091
Default Alt Text
D4048.diff (8 KB)

Event Timeline

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