various updates in states

states/apparmor/defaults.yaml

@@ -1,4 +1,4 @@
 ---
 apparmor:
   enabled: true
-  config:
+  config:

states/cron/defaults.yaml

@@ -6,5 +6,5 @@ cron:
       command: /bin/bash
     MAILTO:
       name: MAILTO
-      command: {{ salt['pillar.get']('syscontact') }}
+      command: me@ac.me
-  tasks:
+  tasks:

states/nftables/defaults.yaml

@@ -1,4 +1,4 @@
 ---
 nftables:
   enabled: true
-  networks: {{ salt['pillar.get']('networks') }}
+  networks:

states/repos/init.sls

@@ -1,4 +1,8 @@
 ---
+repo-require:
+  cmd.run:
+    - name: apt install -y python3-apt
+
 {%- for repo in pillar.get('repos') %}
 
 {%- if repo['enabled'] %}

states/sensu/defaults.yaml

@@ -11,18 +11,18 @@ sensu:
     enabled: false
     config:
       backend-url: []
-      name: {{ salt['grains.get']('fqdn') }}
+      name: hostname
       subscriptions:
-        - {{ salt['grains.get']('type') }}
+        - common
-        - {{ salt['grains.get']('country') }}
+        - france
-        - {{ salt['grains.get']('location') }}
+        - paris
-        - {% filter lower %}{{ salt['grains.get']('os') }}{% endfilter %}
+        - linux
       user: "admin"
       password: "P@ssw0rd!"
       labels:
-        arch: {% filter lower %}{{ salt['grains.get']('osarch') }}{% endfilter %}
+        arch: arm64
         check_load_warning: "3,2,1"
         check_load_critical: "5,3,2"
-        goarch: {% filter lower %}{{ salt['grains.get']('osarch') }}{% endfilter %}
+        goarch: arm64
-        goos: {% filter lower %}{{ salt['grains.get']('kernel') }}{% endfilter %}
+        goos: linux
-        kernel: {% filter lower %}{{ salt['grains.get']('kernel') }}{% endfilter %}
+        kernel: Linux

states/vim/init.sls

@@ -1,5 +1,6 @@
 ---
 include:
+  - pkg
   - .install
   - .config
   - .plugins

states/zabbix/defaults.yaml

@@ -21,7 +21,7 @@ zabbix:
       #- zabbix-get
       #- zabbix-sender
     config:
-      Hostname: {{ salt["grains.get"]("fqdn") }}
+      Hostname: localhost
       Include: "/etc/zabbix/zabbix_agentd.conf.d/*.conf"
       LogFile: /var/log/zabbix/zabbix_agentd.log
       LogFileSize: 0