Page MenuHomeDevCentral
Files F3914720

D1345.diff
No OneTemporary
Actions

D1345.diff
View Options

diff --git a/hotfixes/T1345-drop-jails-from-ysul.sls b/hotfixes/T1345-drop-jails-from-ysul.sls
new file mode 100644
--- /dev/null
+++ b/hotfixes/T1345-drop-jails-from-ysul.sls
@@ -0,0 +1,23 @@
+# -------------------------------------------------------------
+# Salt — Hotfixes to mitigate bugs and security issues
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# Created: 2017-10-17
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# T1345
+#
+# Drop rc configuration launching jails.
+# Keep jails directories' content.
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{% if grains['id'] in pillar['roles_disabled']['paas_jails'] %}
+
+{% for jail_rc_config_file in ['jail', 'netif/jails', 'ezjail'] %}
+/etc/rc.conf.d/{{ jail_rc_config_file }}:
+ file.absent
+{% endfor %}
+
+{% endif %}
diff --git a/hotfixes/init.sls b/hotfixes/init.sls
--- a/hotfixes/init.sls
+++ b/hotfixes/init.sls
@@ -9,4 +9,5 @@
include:
- .CVE-2017-6074
- .T1261-srv-data
+ - .T1345-drop-jails-from-ysul
- .old-directories
diff --git a/hotfixes/init.sls b/pillar/hotfixes/roles.sls
copy from hotfixes/init.sls
copy to pillar/hotfixes/roles.sls
--- a/hotfixes/init.sls
+++ b/pillar/hotfixes/roles.sls
@@ -1,12 +1,12 @@
# -------------------------------------------------------------
-# Salt — Hotfixes to mitigate bugs and security issues
+# Salt configuration for Nasqueron servers
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
-# Created: 2017-02-27
+# Created: 2018-02-22
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-include:
- - .CVE-2017-6074
- - .T1261-srv-data
- - .old-directories
+roles_disabled:
+ paas_jails:
+ # T1345
+ - ysul
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -13,9 +13,9 @@
- certificates.certificates
- nodes.nodes
- nodes.forests
+ - hotfixes.roles
- webserver.sites
ysul:
- - paas-jails.jails
- viperserv.bots
- viperserv.fantoir
- webserver.wwwroot51
diff --git a/top.sls b/top.sls
--- a/top.sls
+++ b/top.sls
@@ -21,7 +21,6 @@
'local':
- roles/saltmaster
'ysul':
- - roles/paas-jails
- roles/dbserver-mysql
- roles/devserver
- roles/viperserv

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 20, 16:43 (21 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2308279
Default Alt Text
D1345.diff (2 KB)

Event Timeline

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