Page MenuHomeDevCentral
Files F3767026

No OneTemporary
Actions

View Options

diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
index 11c4955..566b3de 100644
--- a/pillar/nodes/nodes.sls
+++ b/pillar/nodes/nodes.sls
@@ -1,61 +1,63 @@
# -------------------------------------------------------------
# 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:
ipv6_tunnel: False
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
ipv6_gateway: 2001:470:1f12:9e1::1
ipv4_aliases:
- 212.83.187.132
ipv6_tunnel: True
##
## Forest: Eglide
## Semantic field: ? (P27 used for "Eglide" too)
##
## This forest is intended to separate credentials
## between Eglide and Nasqueron sevrers.
##
eglide:
forest: eglide
hostname: eglide.org
roles:
- shellserver
network:
ipv6_tunnel: True
+ fixes:
+ rsyslog_xconsole: True
diff --git a/roles/core/rsyslog/init.sls b/roles/core/rsyslog/init.sls
index 3e5ef73..99ba25d 100644
--- a/roles/core/rsyslog/init.sls
+++ b/roles/core/rsyslog/init.sls
@@ -1,20 +1,20 @@
# -------------------------------------------------------------
# Salt — rsyslog
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Eglide
# Created: 2016-09-11
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
# -------------------------------------------------------------
# Ensure xconsole pipeline isn't configured
#
# See http://kb.monitorware.com/kbeventdb-detail-id-6925.html
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-{% if salt['file.directory_exists' ]('/etc/rsyslog.d') %}
+{% if salt['node.has']('fixes:rsyslog_xconsole') %}
/etc/rsyslog.d/50-default.conf:
file.managed:
- name : /etc/rsyslog.d/50-default.conf
- source: salt://roles/core/rsyslog/files/default.conf
{% endif %}

File Metadata

Mime Type
text/x-diff
Expires
Sun, Nov 24, 21:58 (10 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2258991
Default Alt Text
(2 KB)

Event Timeline

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