Modification for Vim 8

diff --git a/basic/pkgs.sls b/basic/pkgs.sls
index ca65656aa8a567ab1850881ca6c5f5b17a028fde..34af00d787d9614db0536f263bad2cbee8ce3887 100644 (file)
--- a/basic/pkgs.sls
+++ b/basic/pkgs.sls
@@ -39,9 +39,7 @@ common-pkgs:
       # - lvm2
       - make
       # - mlocate
-{%- if  salt['grains.get']('os_family', '') == 'Debian' %}{% if salt['grains.get']('osmajorrelease', 9) != 'testing' %}
-      - openssl-blacklist
-{%- endif %}{% endif %}
+      # - openssl-blacklist
       # - parted
       - patch
       - psmisc

diff --git a/debian/sysvinit.sls b/debian/sysvinit.sls
index 1974a3fc9535d53b25ebb5efbcd40ac94456f0e8..7f70226b8a343c818fe50cab0c1a086ab8ff8feb 100644 (file)
--- a/debian/sysvinit.sls
+++ b/debian/sysvinit.sls
@@ -4,10 +4,10 @@
 sysvinit-core:
   pkg.installed
 
-systemd:
-  pkg.removed:
-    - require:
-      - pkg: sysvinit-core
+#systemd:
+#  pkg.removed:
+#    - require:
+#      - pkg: sysvinit-core
 
 {% endif %}
 

diff --git a/fail2ban/init.sls b/fail2ban/init.sls
index 04e908ee7ba122e5cc425e1461213ec1551c91d9..b3ca28862907593f9f664f670438670a50c9a317 100644 (file)
--- a/fail2ban/init.sls
+++ b/fail2ban/init.sls
@@ -23,7 +23,7 @@ fail2ban-pkgs:
 
 /etc/fail2ban/fail2ban.conf:
   file.managed:
-{%- if osmajorrelease > 8 %}
+{%- if osmajorrelease != "8" %}
     - source: salt://fail2ban/files/fail2ban.conf.v0.9
 {%- else %}
     - source: salt://fail2ban/files/fail2ban.conf.v0.8
@@ -67,7 +67,7 @@ file2ban_{{ filename }}:
 
 /etc/fail2ban/jail.conf:
   file.managed:
-{%- if osmajorrelease > 8 %}
+{%- if osmajorrelease != "8" %}
     - source: salt://fail2ban/files/jail.conf.v0.9
 {%- else %}
     - source: salt://fail2ban/files/jail.conf