diff --git a/hotfixes/init.sls b/hotfixes/init.sls index a3ca6f2..453b817 100644 --- a/hotfixes/init.sls +++ b/hotfixes/init.sls @@ -1,11 +1,12 @@ # ------------------------------------------------------------- # Salt — Hotfixes to mitigate bugs and security issues # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2017-02-27 # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- include: - .CVE-2017-6074 - .T1261-srv-data + - .old-directories diff --git a/hotfixes/old-directories.sls b/hotfixes/old-directories.sls new file mode 100644 index 0000000..3e46d1f --- /dev/null +++ b/hotfixes/old-directories.sls @@ -0,0 +1,23 @@ +# ------------------------------------------------------------- +# Salt — Hotfixes to mitigate bugs and security issues +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Project: Nasqueron +# Created: 2017-11-23 +# License: Trivial work, not eligible to copyright +# ------------------------------------------------------------- + +# ------------------------------------------------------------- +# T1325 +# We now provision /var/wwwwroot/ for +# all servers and not only for the web servers. +# +# As such, /var/www/html nginx default directory on shellserver +# role can be pruned. +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +{% if salt['node.has_role']('shellserver') %} + +/var/www/html: + file.absent + +{% endif %}