diff --git a/states/apparmor/defaults.yaml b/states/apparmor/defaults.yaml index b45cafb..568dd3e 100644 --- a/states/apparmor/defaults.yaml +++ b/states/apparmor/defaults.yaml @@ -1,4 +1,4 @@ --- apparmor: enabled: true - config: \ No newline at end of file + config: diff --git a/states/cron/defaults.yaml b/states/cron/defaults.yaml index e22a0a1..bd2fdaa 100644 --- a/states/cron/defaults.yaml +++ b/states/cron/defaults.yaml @@ -6,5 +6,5 @@ cron: command: /bin/bash MAILTO: name: MAILTO - command: {{ salt['pillar.get']('syscontact') }} - tasks: \ No newline at end of file + command: me@ac.me + tasks: diff --git a/states/nftables/defaults.yaml b/states/nftables/defaults.yaml index d969a98..951d332 100644 --- a/states/nftables/defaults.yaml +++ b/states/nftables/defaults.yaml @@ -1,4 +1,4 @@ --- nftables: enabled: true - networks: {{ salt['pillar.get']('networks') }} \ No newline at end of file + networks: diff --git a/states/repos/init.sls b/states/repos/init.sls index 8cb57e9..3e61a83 100644 --- a/states/repos/init.sls +++ b/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'] %} diff --git a/states/sensu/defaults.yaml b/states/sensu/defaults.yaml index 26b28de..67d66c8 100644 --- a/states/sensu/defaults.yaml +++ b/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') }} - - {{ salt['grains.get']('country') }} - - {{ salt['grains.get']('location') }} - - {% filter lower %}{{ salt['grains.get']('os') }}{% endfilter %} + - common + - france + - paris + - 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 %} - goos: {% filter lower %}{{ salt['grains.get']('kernel') }}{% endfilter %} - kernel: {% filter lower %}{{ salt['grains.get']('kernel') }}{% endfilter %} \ No newline at end of file + goarch: arm64 + goos: linux + kernel: Linux diff --git a/states/vim/init.sls b/states/vim/init.sls index 26b777b..a1d7090 100644 --- a/states/vim/init.sls +++ b/states/vim/init.sls @@ -1,5 +1,6 @@ --- include: + - pkg - .install - .config - .plugins diff --git a/states/zabbix/defaults.yaml b/states/zabbix/defaults.yaml index 1fa32a2..3d0450e 100644 --- a/states/zabbix/defaults.yaml +++ b/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