diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls index d218963..9246f87 100644 --- a/pillar/nodes/nodes.sls +++ b/pillar/nodes/nodes.sls @@ -1,73 +1,95 @@ # ------------------------------------------------------------- # Salt — Nodes # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2017-10-20 # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- nodes: ## ## Forest: Nasqueron ## Semantic field: https://devcentral.nasqueron.org/P27 ## dwellers: forest: nasqueron-infra hostname: dwellers.nasqueron.org roles: - paas-lxc - paas-docker - mastodon network: ipv6_tunnel: True equatower: forest: nasqueron-infra hostname: equatower.nasqueron.org roles: - paas-docker network: ipv4_address: 51.255.124.10 ipv4_gateway: 91.121.86.254 ipv6_tunnel: True ysul: forest: nasqueron-dev hostname: ysul.nasqueron.org roles: - devserver - saltmaster - dbserver-mysql - webserver-legacy zfs: pool: arcology network: ipv4_interface: igb0 ipv4_address: 163.172.49.16 ipv4_gateway: 163.172.49.1 ipv4_aliases: - 212.83.187.132 ipv6_tunnel: True ipv6_gateway: 2001:470:1f12:9e1::1 + windriver: + forest: nasqueron-dev + hostname: windriver.nasqueron.org + roles: + - devserver + - saltmaster + - dbserver-mysql + - webserver-legacy + zfs: + pool: arcology + network: + ipv4_interface: igb0 + ipv4_address: 51.159.18.59 + ipv4_gateway: 51.159.18.1 + + ipv6_interface: igb0 + ipv6_address: 2001:0bc8:6005:0005:aa1e:84ff:fef3:5d9c + ipv6_prefix: 128 + ipv6_native: True + + ipv6_tunnel: False + ## ## Forest: Eglide ## Semantic field: ? (P27 used for "Eglide" too) ## ## This forest is intended to separate credentials ## between Eglide and Nasqueron servers. ## eglide: forest: eglide hostname: eglide.org roles: - shellserver network: ipv6_tunnel: True fixes: rsyslog_xconsole: True diff --git a/pillar/top.sls b/pillar/top.sls index 2bee53a..2dba764 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -1,41 +1,46 @@ # ------------------------------------------------------------- # Salt configuration for Nasqueron servers # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2016-04-10 # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- base: '*': - core.users - core.groups - certificates.certificates - nodes.nodes - nodes.forests - hotfixes.roles - webserver.sites dwellers: - credentials.zr - paas.docker - saas.sentry eglide: - shellserver.quassel equatower: - credentials.zr - paas.docker - saas.jenkins - saas.phpbb - saas.sentry ysul: - devserver.repos - paas.docker - saas.mediawiki - viperserv.bots - viperserv.fantoir - webserver.labs - webserver.wwwroot51 + + windriver: + - devserver.repos + - webserver.labs + - webserver.wwwroot51 diff --git a/roles/core/motd/files/windriver b/roles/core/motd/files/windriver new file mode 100644 index 0000000..28eca72 --- /dev/null +++ b/roles/core/motd/files/windriver @@ -0,0 +1,10 @@ +__ __ _ _ __ _ +/ / /\ \ (_)_ __ __| | /__(_)_ _____ _ __ Welcome to WindRiver, +\ \/ \/ / | '_ \ / _` |/ \// \ \ / / _ \ '__| a Nasqueron server. +\ /\ /| | | | | (_| / _ \ |\ V / __/ | + \/ \/ |_|_| |_|\__,_\/ \_/_| \_/ \___|_| Development | Staging area + Management | Salt master + + [Haiku] Time forms the mountain. [News] 2019-11-22 + Rain, wind, rivers, do their work. Server installed. + Shadows reveal depth. Tracking task: T1536 diff --git a/top.sls b/top.sls index 1b9c06c..905e23b 100644 --- a/top.sls +++ b/top.sls @@ -1,30 +1,36 @@ # ------------------------------------------------------------- # Salt configuration for Nasqueron servers # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2016-04-10 # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- base: '*': - roles/core - roles/webserver-content 'local': - roles/saltmaster 'ysul': - roles/builder - roles/dbserver-mysql - roles/devserver - roles/viperserv - roles/webserver-core - roles/webserver-legacy - roles/webserver-varnish + 'windriver': + - roles/builder + - roles/dbserver-mysql + - roles/devserver + - roles/webserver-core + - roles/webserver-legacy 'dwellers': - roles/paas-docker/docker - roles/paas-lxc/lxc 'eglide': - roles/webserver-core - roles/shellserver 'equatower': - roles/paas-docker