From d456c0e9eb5ebd1c5b7ccbdf39e984538443008c Mon Sep 17 00:00:00 2001 From: Paul Lecuq Date: Thu, 19 Aug 2021 21:15:24 +0200 Subject: [PATCH] lint on states --- states/androidstudio/defaults.yaml | 2 +- states/arduino/defaults.yaml | 2 +- states/bareos/bareos-fd.sls | 2 +- states/bareos/config.sls | 2 +- states/bareos/defaults.yaml | 2 +- states/bareos/init.sls | 2 +- states/bareos/install.sls | 2 +- states/bareos/kernelmap.yaml | 2 +- states/bareos/osarchmap.yaml | 2 +- states/bareos/service.sls | 2 +- states/borg/map.jinja | 2 +- states/borg/templates/borg_job.sh.j2 | 2 +- states/borg/templates/borg_sudo.j2 | 2 +- states/burp/client/config.sls | 2 +- states/burp/client/service.sls | 2 +- states/burp/defaults.yaml | 2 +- states/burp/init.sls | 2 +- states/burp/install.sls | 2 +- states/burp/pkg.sls | 2 +- states/cds/config.sls | 2 +- states/cds/defaults.yaml | 2 +- states/cds/init.sls | 2 +- states/cds/install.sls | 2 +- states/cds/service.sls | 2 +- states/coronafana/init.sls | 2 +- states/coronafana/install.sls | 2 +- states/coronafana/kernelmap.yaml | 2 +- states/coronafana/osarchmap.yaml | 2 +- states/dip/defaults.yaml | 2 +- states/dip/dip.service.j2 | 2 +- states/dip/kernelmap.yaml | 2 +- states/dip/osarchmap.yaml | 2 +- states/dkron/defaults.yaml | 24 +++++++++---------- states/dkron/kernelmap.yaml | 2 +- states/docker/defaults.yaml | 6 ++--- states/dovecot/defaults.yaml | 4 ++-- states/dovecot/files/config.j2 | 2 +- states/dovecot/install.sls | 2 +- states/drone/defaults.yaml | 2 +- states/drone/init.sls | 2 +- states/drone/server.sls | 2 +- states/fuelprices/init.sls | 2 +- states/fuelprices/install.sls | 2 +- states/fuelprices/kernelmap.yaml | 2 +- states/fuelprices/osarchmap.yaml | 2 +- states/g2g/init.sls | 2 +- states/g2g/install.sls | 2 +- states/g2g/kernelmap.yaml | 2 +- states/g2g/osarchmap.yaml | 2 +- states/gobackup/init.sls | 2 +- states/gobackup/kernelmap.yaml | 2 +- states/gobackup/osarchmap.yaml | 2 +- states/golang/init.sls | 2 +- states/golang/kernelmap.yaml | 2 +- states/golang/osarchmap.yaml | 2 +- states/gufw/init.sls | 2 +- states/influxdb/config.sls | 2 +- states/influxdb/kernelmap.yaml | 2 +- states/influxdb/osarchmap.yaml | 2 +- states/influxdb/v2/influxdb.service_v2.j2 | 2 +- states/ipfs/init.sls | 2 +- states/ipfs/install.sls | 2 +- states/ipfs/kernelmap.yaml | 2 +- states/ipfs/osarchmap.yaml | 2 +- states/ipfs/service.sls | 2 +- states/iptables/init.sls | 2 +- states/iptables/iptables.sls | 2 +- states/java/defaults.yaml | 2 +- states/java/init.sls | 2 +- states/java/install.sls | 2 +- states/java/kernelmap.yaml | 2 +- states/java/osarchmap.yaml | 2 +- states/lego/init.sls | 2 +- states/lego/kernelmap.yaml | 2 +- states/lego/map.jinja | 2 +- states/locale/init.sls | 2 +- states/maildb/defaults.yaml | 2 +- states/mariadb/config.sls | 2 +- states/mariadb/databases.sls | 2 +- states/mariadb/defaults.yaml | 2 +- states/mariadb/init.sls | 2 +- states/mariadb/service.sls | 2 +- states/netbox/defaults.yaml | 22 ++++++++--------- states/netbox/init.sls | 2 +- states/netbox/install.sls | 2 +- states/netbox/pkgs.sls | 2 +- states/netbox/service.sls | 2 +- states/netboxinventory/defaults.yaml | 2 +- states/netboxinventory/init.sls | 2 +- states/nextcloud/init.sls | 2 +- states/nextcloud/templates/config.php.j2 | 2 +- states/nextcloud_desktop/init.sls | 2 +- states/nextcloud_desktop/nextcloud.desktop | 2 +- states/nftables/defaults.yaml | 2 +- states/nftables/init.sls | 2 +- states/nftables/nftables.conf.j2 | 2 +- states/npf/defaults.yaml | 2 +- states/npf/init.sls | 2 +- .../{oldstates => old}/clamav/clamd.conf.j2 | 0 states/{oldstates => old}/clamav/config.sls | 0 .../{oldstates => old}/clamav/defaults.yaml | 0 states/{oldstates => old}/clamav/init.sls | 0 states/{oldstates => old}/clamav/install.sls | 0 states/{oldstates => old}/clamav/map.jinja | 0 states/{oldstates => old}/clamav/service.sls | 0 .../collectd/collectd.conf.j2 | 0 states/{oldstates => old}/collectd/config.sls | 0 states/{oldstates => old}/collectd/init.sls | 0 .../{oldstates => old}/collectd/install.sls | 0 .../{oldstates => old}/collectd/service.sls | 0 .../sensu/agent/agent.yml.j2 | 0 .../{oldstates => old}/sensu/agent/init.sls | 0 .../sensu/agent/sensu-agent.service.j2 | 0 states/{oldstates => old}/sensu/defaults.yaml | 0 states/{oldstates => old}/sensu/init.sls | 0 states/{oldstates => old}/sensu/map.jinja | 0 states/{oldstates => old}/snmp/init.sls | 0 states/{oldstates => old}/snmp/snmpd.conf.j2 | 0 states/opendkim/config.sls | 2 +- states/opendkim/defaults.yaml | 12 +++++----- states/opendkim/init.sls | 2 +- states/opendkim/install.sls | 2 +- states/opendkim/service.sls | 2 +- states/openvpn_client/init.sls | 2 +- states/openvpn_client/install.sls | 2 +- states/openvpn_client/map.jinja | 2 +- states/openvpn_client/pass.j2 | 2 +- states/openvpn_client/service.sls | 2 +- states/openvpn_client/vpn.conf.j2 | 2 +- states/ovh/defaults.yaml | 2 +- states/ovh/domain.sls | 2 +- states/ovh/init.sls | 2 +- states/ovh/pkg.sls | 2 +- states/packer/defaults.yaml | 2 +- states/packer/init.sls | 2 +- states/packer/install.sls | 2 +- states/packer/kernelmap.yaml | 2 +- states/packer/osarchmap.yaml | 2 +- states/php/init.sls | 2 +- states/php/install.sls | 2 +- states/php/service.sls | 2 +- states/pkg/bootstrap.sls | 2 +- states/pkg/remove.sls | 2 +- states/pki/install.sls | 2 +- states/pki/kernelmap.yaml | 2 +- states/pki/map.jinja | 2 +- states/pki/osarchmap.yaml | 2 +- states/pki/pki.service.j2 | 2 +- states/postfix/init.sls | 2 +- states/postfix/install.sls | 2 +- states/postfix/map.jinja | 2 +- states/postfix/maps.sls | 2 +- states/postfix/service.sls | 2 +- states/postfix/templates/master.cf.j2 | 2 +- states/pycharm/init.sls | 2 +- states/pycharm/install.sls | 1 - states/qrz/init.sls | 2 +- states/qrz/install.sls | 2 +- states/qrz/kernelmap.yaml | 2 +- states/qrz/osarchmap.yaml | 2 +- states/qrz/qrz.service.j2 | 2 +- states/qrz/service.sls | 2 +- states/rainloop/config.sls | 4 +--- states/rainloop/map.jinja | 2 +- states/rclone/defaults.yaml | 2 +- states/rclone/init.sls | 2 +- states/rclone/kernelmap.yaml | 2 +- states/rclone/osarchmap.yaml | 2 +- states/redis/defaults.yaml | 2 +- states/redis/init.sls | 2 +- states/redis/install.sls | 2 +- states/redis/service.sls | 2 +- states/rspamd/defaults.yaml | 2 +- states/rsync/defaults.yaml | 2 +- states/rsyslog/rsyslog.conf.j2 | 2 +- states/salt_minion/defaults.yaml | 16 ++++++------- states/salt_minion/service.sls | 2 +- states/samba/config.sls | 2 +- states/samba/defaults.yaml | 2 +- states/samba/install.sls | 2 +- states/samba/users.sls | 2 +- states/ssh/defaults.yaml | 2 +- states/ssh/init.sls | 2 +- states/ssh/map.jinja | 2 +- states/ssh/ssh_config.j2 | 2 +- states/ssh/sshd_config.j2 | 2 +- states/states/defaults.yaml | 2 +- states/sublimetext/install.sls | 1 - states/sublimetext/kernelmap.yaml | 2 +- states/sublimetext/osarchmap.yaml | 2 +- states/sudo/sudoers.j2 | 2 +- states/telegraf/kernelmap.yaml | 2 +- states/telegraf/osarchmap.yaml | 2 +- states/time/defaults.yaml | 5 +++- states/time/install.sls | 2 +- states/tor/defaults.yaml | 2 +- states/tor/torrc.j2 | 2 +- states/transmission/defaults.yaml | 2 +- states/transmission/settings.json.j2 | 2 +- states/users/defaults.yaml | 2 +- states/vim/vimrc.j2 | 2 +- states/vsftpd/vsftpd.conf.j2 | 3 +-- states/weather/kernelmap.yaml | 2 +- states/weather/osarchmap.yaml | 2 +- states/website/defaults.yaml | 2 +- states/winpkg/bootstrap.sls | 2 +- states/winpkg/defaults.yaml | 2 +- states/winpkg/init.sls | 2 +- states/winpkg/install.sls | 2 +- states/youtubedl/defaults.yaml | 4 ++-- states/zabbix/defaults.yaml | 4 ++-- states/zsh/defaults.yaml | 2 +- states/zsh/zprofile.j2 | 2 +- 213 files changed, 232 insertions(+), 234 deletions(-) rename states/{oldstates => old}/clamav/clamd.conf.j2 (100%) rename states/{oldstates => old}/clamav/config.sls (100%) rename states/{oldstates => old}/clamav/defaults.yaml (100%) rename states/{oldstates => old}/clamav/init.sls (100%) rename states/{oldstates => old}/clamav/install.sls (100%) rename states/{oldstates => old}/clamav/map.jinja (100%) rename states/{oldstates => old}/clamav/service.sls (100%) rename states/{oldstates => old}/collectd/collectd.conf.j2 (100%) rename states/{oldstates => old}/collectd/config.sls (100%) rename states/{oldstates => old}/collectd/init.sls (100%) rename states/{oldstates => old}/collectd/install.sls (100%) rename states/{oldstates => old}/collectd/service.sls (100%) rename states/{oldstates => old}/sensu/agent/agent.yml.j2 (100%) rename states/{oldstates => old}/sensu/agent/init.sls (100%) rename states/{oldstates => old}/sensu/agent/sensu-agent.service.j2 (100%) rename states/{oldstates => old}/sensu/defaults.yaml (100%) rename states/{oldstates => old}/sensu/init.sls (100%) rename states/{oldstates => old}/sensu/map.jinja (100%) rename states/{oldstates => old}/snmp/init.sls (100%) rename states/{oldstates => old}/snmp/snmpd.conf.j2 (100%) diff --git a/states/androidstudio/defaults.yaml b/states/androidstudio/defaults.yaml index 9f678cd..ee37d6a 100644 --- a/states/androidstudio/defaults.yaml +++ b/states/androidstudio/defaults.yaml @@ -2,4 +2,4 @@ androidstudio: enabled: true install_dir: /usr/local/apps - config: \ No newline at end of file + config: {} diff --git a/states/arduino/defaults.yaml b/states/arduino/defaults.yaml index 91185cc..6a3b74a 100644 --- a/states/arduino/defaults.yaml +++ b/states/arduino/defaults.yaml @@ -2,4 +2,4 @@ arduino: mirror: https://downloads.arduino.cc install_dir: /usr/local/apps - release_dir: /usr/local/apps/releases \ No newline at end of file + release_dir: /usr/local/apps/releases diff --git a/states/bareos/bareos-fd.sls b/states/bareos/bareos-fd.sls index 69b75e7..03f8b11 100644 --- a/states/bareos/bareos-fd.sls +++ b/states/bareos/bareos-fd.sls @@ -56,4 +56,4 @@ bareos-fd-service: - enable: true - require: - file: bareos-fd-service-file -{%- endif %} \ No newline at end of file +{%- endif %} diff --git a/states/bareos/config.sls b/states/bareos/config.sls index 16f08db..7847a23 100644 --- a/states/bareos/config.sls +++ b/states/bareos/config.sls @@ -18,4 +18,4 @@ bareos-fd-config: - service: bareos-fd-service - require: - file: bareos-fd-bin - - file: bareos-fd-config-dir \ No newline at end of file + - file: bareos-fd-config-dir diff --git a/states/bareos/defaults.yaml b/states/bareos/defaults.yaml index 8366fae..73e506d 100644 --- a/states/bareos/defaults.yaml +++ b/states/bareos/defaults.yaml @@ -5,4 +5,4 @@ bareos: install_dir: /usr/local/bin mirror: https://paulbsd-pub.s3.fr-par.scw.cloud/bareos os: linux - arch: amd64 \ No newline at end of file + arch: amd64 diff --git a/states/bareos/init.sls b/states/bareos/init.sls index 93e8737..7604cfd 100644 --- a/states/bareos/init.sls +++ b/states/bareos/init.sls @@ -2,4 +2,4 @@ {%- if salt['grains.get']('kernel') == 'Linux' %} include: - .install -{%- endif %} \ No newline at end of file +{%- endif %} diff --git a/states/bareos/install.sls b/states/bareos/install.sls index 50858d7..a0d2277 100644 --- a/states/bareos/install.sls +++ b/states/bareos/install.sls @@ -14,4 +14,4 @@ bareos-fd-bin: - skip_verify: true - user: root - group: root - - mode: 0755 \ No newline at end of file + - mode: 0755 diff --git a/states/bareos/kernelmap.yaml b/states/bareos/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/bareos/kernelmap.yaml +++ b/states/bareos/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/bareos/osarchmap.yaml b/states/bareos/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/bareos/osarchmap.yaml +++ b/states/bareos/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/bareos/service.sls b/states/bareos/service.sls index cd265cb..d684279 100644 --- a/states/bareos/service.sls +++ b/states/bareos/service.sls @@ -16,4 +16,4 @@ bareos-fd-service: - name: bareos-fd - enable: true - require: - - file: bareos-fd-service-file \ No newline at end of file + - file: bareos-fd-service-file diff --git a/states/borg/map.jinja b/states/borg/map.jinja index 524d545..fe01271 100644 --- a/states/borg/map.jinja +++ b/states/borg/map.jinja @@ -5,4 +5,4 @@ default=defaults.borg, merge=True ) --%} +-%} \ No newline at end of file diff --git a/states/borg/templates/borg_job.sh.j2 b/states/borg/templates/borg_job.sh.j2 index 9ef5fa3..f82faa8 100644 --- a/states/borg/templates/borg_job.sh.j2 +++ b/states/borg/templates/borg_job.sh.j2 @@ -70,4 +70,4 @@ else info "Backup and/or Prune finished with errors" fi -exit ${global_exit} +exit ${global_exit} \ No newline at end of file diff --git a/states/borg/templates/borg_sudo.j2 b/states/borg/templates/borg_sudo.j2 index 1741f78..8cd3d72 100644 --- a/states/borg/templates/borg_sudo.j2 +++ b/states/borg/templates/borg_sudo.j2 @@ -1,3 +1,3 @@ {%- from "borg/map.jinja" import borg with context %} ## Sudo rights for borg run_user -{{ borg.run_user }} ALL=(ALL) NOPASSWD: {{ borg.working_dir }}/scripts/borg_*.sh +{{ borg.run_user }} ALL=(ALL) NOPASSWD: {{ borg.working_dir }}/scripts/borg_*.sh \ No newline at end of file diff --git a/states/burp/client/config.sls b/states/burp/client/config.sls index d3a270e..67a8100 100644 --- a/states/burp/client/config.sls +++ b/states/burp/client/config.sls @@ -8,4 +8,4 @@ burp-client-config: - mode: 0644 - template: jinja - require: - - pkg: burp-pkg \ No newline at end of file + - pkg: burp-pkg diff --git a/states/burp/client/service.sls b/states/burp/client/service.sls index d7e6869..e14642a 100644 --- a/states/burp/client/service.sls +++ b/states/burp/client/service.sls @@ -16,4 +16,4 @@ burp-timer: - user: root - mode: 0644 - template: jinja -{%- endif %} \ No newline at end of file +{%- endif %} diff --git a/states/burp/defaults.yaml b/states/burp/defaults.yaml index 5729862..82ec592 100644 --- a/states/burp/defaults.yaml +++ b/states/burp/defaults.yaml @@ -63,4 +63,4 @@ burp: exclude_fs: tmpfs exclude_comp: bz2 exclude_comp: gz - nobackup: .nobackup \ No newline at end of file + nobackup: .nobackup diff --git a/states/burp/init.sls b/states/burp/init.sls index 5fa3b56..0e39dd5 100644 --- a/states/burp/init.sls +++ b/states/burp/init.sls @@ -9,4 +9,4 @@ include: {%- elif salt['grains.get']('fqdn') in burp.hosts.name %} - .client.config - .client.service -{%- endif %} \ No newline at end of file +{%- endif %} diff --git a/states/burp/install.sls b/states/burp/install.sls index 0ceeea6..170f53d 100644 --- a/states/burp/install.sls +++ b/states/burp/install.sls @@ -4,4 +4,4 @@ burp-config-dir: file.directory: - name: /etc/burp - user: root - - mode: 0755 \ No newline at end of file + - mode: 0755 diff --git a/states/burp/pkg.sls b/states/burp/pkg.sls index c69df6a..632d7e3 100644 --- a/states/burp/pkg.sls +++ b/states/burp/pkg.sls @@ -1,4 +1,4 @@ --- burp-pkg: pkg.installed: - - name: burp \ No newline at end of file + - name: burp diff --git a/states/cds/config.sls b/states/cds/config.sls index 1b056bd..e9cdbca 100644 --- a/states/cds/config.sls +++ b/states/cds/config.sls @@ -14,4 +14,4 @@ cds-config-file: - group: root - template: jinja - watch_in: - - service: cds-service \ No newline at end of file + - service: cds-service diff --git a/states/cds/defaults.yaml b/states/cds/defaults.yaml index 7742735..2d03ebe 100644 --- a/states/cds/defaults.yaml +++ b/states/cds/defaults.yaml @@ -4,4 +4,4 @@ cds: enabled: true config: mirror: https://github.com/ovh/cds/releases/download/ - version: 0.43.1 \ No newline at end of file + version: 0.43.1 diff --git a/states/cds/init.sls b/states/cds/init.sls index d3c2f35..f6daac2 100644 --- a/states/cds/init.sls +++ b/states/cds/init.sls @@ -3,4 +3,4 @@ include: - .install - .config - - .service \ No newline at end of file + - .service diff --git a/states/cds/install.sls b/states/cds/install.sls index 06c68c7..fb8ed71 100644 --- a/states/cds/install.sls +++ b/states/cds/install.sls @@ -9,4 +9,4 @@ cds-engine-install: cds-bin-symlink: file.symlink: - name: /usr/bin/cds-engine - - target: /usr/bin/cds-engine-{{ salt['pillar.get']('cds:version') }} \ No newline at end of file + - target: /usr/bin/cds-engine-{{ salt['pillar.get']('cds:version') }} diff --git a/states/cds/service.sls b/states/cds/service.sls index 3818c6d..8375548 100644 --- a/states/cds/service.sls +++ b/states/cds/service.sls @@ -12,4 +12,4 @@ cds-service-file: cds-service: service.running: - name: cds - - enable: true \ No newline at end of file + - enable: true diff --git a/states/coronafana/init.sls b/states/coronafana/init.sls index 10ad9a6..e39dc86 100644 --- a/states/coronafana/init.sls +++ b/states/coronafana/init.sls @@ -1,3 +1,3 @@ --- include: - - .install \ No newline at end of file + - .install diff --git a/states/coronafana/install.sls b/states/coronafana/install.sls index 9fdcd3d..3707d95 100644 --- a/states/coronafana/install.sls +++ b/states/coronafana/install.sls @@ -13,4 +13,4 @@ coronafana-binary-symlink: - name: {{ coronafana.install_dir }}/coronafana - target: {{ coronafana.release_dir }}/coronafana-{{ coronafana.version }} - require: - - archive: coronafana-archive-extract \ No newline at end of file + - archive: coronafana-archive-extract diff --git a/states/coronafana/kernelmap.yaml b/states/coronafana/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/coronafana/kernelmap.yaml +++ b/states/coronafana/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/coronafana/osarchmap.yaml b/states/coronafana/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/coronafana/osarchmap.yaml +++ b/states/coronafana/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/dip/defaults.yaml b/states/dip/defaults.yaml index 5167c88..7d48d63 100644 --- a/states/dip/defaults.yaml +++ b/states/dip/defaults.yaml @@ -8,4 +8,4 @@ dip: mirror: https://git.paulbsd.com/paulbsd/dip/releases/download version: 1.0.0 os: linux - arch: amd64 \ No newline at end of file + arch: amd64 diff --git a/states/dip/dip.service.j2 b/states/dip/dip.service.j2 index 69278db..1a5f1b2 100644 --- a/states/dip/dip.service.j2 +++ b/states/dip/dip.service.j2 @@ -9,4 +9,4 @@ Type=simple ExecStart={{ dip.install_dir }}/dip/dip -host {{ dip.host }} -port {{ dip.port }} [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target \ No newline at end of file diff --git a/states/dip/kernelmap.yaml b/states/dip/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/dip/kernelmap.yaml +++ b/states/dip/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/dip/osarchmap.yaml b/states/dip/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/dip/osarchmap.yaml +++ b/states/dip/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/dkron/defaults.yaml b/states/dkron/defaults.yaml index f1298bc..0cecc15 100644 --- a/states/dkron/defaults.yaml +++ b/states/dkron/defaults.yaml @@ -1,21 +1,21 @@ --- dkron: enabled: true - install_dir: "/usr/local/apps" - release_dir: "/usr/local/apps/releases" - mirror: "https://github.com/distribworks/dkron/releases/download" - version: "3.0.5" - os: "linux" - arch: "amd64" - runuser: "dkron" - user: "user" - password: "password" - url: "http://localhost:8898" + install_dir: /usr/local/apps + release_dir: /usr/local/apps/releases + mirror: https://github.com/distribworks/dkron/releases/download + version: 3.0.5 + os: linux + arch: amd64 + runuser: dkron + user: user + password: password + url: http://localhost:8898 verify: false config: bootstrap-expect: 1 server: true ui: true - http-addr: "127.0.0.1:8898" - data-dir: "/var/lib/dkron" + http-addr: 127.0.0.1:8898 + data-dir: /var/lib/dkron jobs_list: [] diff --git a/states/dkron/kernelmap.yaml b/states/dkron/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/dkron/kernelmap.yaml +++ b/states/dkron/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/docker/defaults.yaml b/states/docker/defaults.yaml index 604f112..2c05833 100644 --- a/states/docker/defaults.yaml +++ b/states/docker/defaults.yaml @@ -1,8 +1,8 @@ --- docker: enabled: true - config_dir: "/etc/docker" - config_file: "daemon.json" + config_dir: /etc/docker + config_file: daemon.json pkgs: - docker-ce - docker-ce-cli @@ -10,4 +10,4 @@ docker: - docker-compose daemon: config: - storage-driver: overlay2 \ No newline at end of file + storage-driver: overlay2 diff --git a/states/dovecot/defaults.yaml b/states/dovecot/defaults.yaml index ff4760d..1791a4b 100644 --- a/states/dovecot/defaults.yaml +++ b/states/dovecot/defaults.yaml @@ -94,8 +94,8 @@ dovecot: 15-lda.conf: hostname: host.example.com sendmail_path: /usr/sbin/sendmail - lda_mailbox_autocreate: yes - lda_mailbox_autosubscribe: yes + lda_mailbox_autocreate: 'yes' + lda_mailbox_autosubscribe: 'yes' protocol lda: mail_plugins: $mail_plugins autocreate sieve quota postmaster_address: postmaster@example.com diff --git a/states/dovecot/files/config.j2 b/states/dovecot/files/config.j2 index ed11488..4da66ff 100644 --- a/states/dovecot/files/config.j2 +++ b/states/dovecot/files/config.j2 @@ -18,4 +18,4 @@ {%- for key, value in config.items() %} {{ render(key, value) }} -{%- endfor %} +{%- endfor %} \ No newline at end of file diff --git a/states/dovecot/install.sls b/states/dovecot/install.sls index 08a5470..540a8c4 100644 --- a/states/dovecot/install.sls +++ b/states/dovecot/install.sls @@ -2,4 +2,4 @@ {%- from "dovecot/map.jinja" import dovecot with context %} dovecot-pkgs: pkg.installed: - - pkgs: {{ dovecot.pkgs }} \ No newline at end of file + - pkgs: {{ dovecot.pkgs }} diff --git a/states/drone/defaults.yaml b/states/drone/defaults.yaml index daaca88..808738b 100644 --- a/states/drone/defaults.yaml +++ b/states/drone/defaults.yaml @@ -1,4 +1,4 @@ --- drone: enabled: true - server: \ No newline at end of file + server: {} diff --git a/states/drone/init.sls b/states/drone/init.sls index 4d4c529..ea819d6 100644 --- a/states/drone/init.sls +++ b/states/drone/init.sls @@ -1,4 +1,4 @@ --- include: - docker - - .server \ No newline at end of file + - .server diff --git a/states/drone/server.sls b/states/drone/server.sls index 94bfded..b76e75c 100644 --- a/states/drone/server.sls +++ b/states/drone/server.sls @@ -4,4 +4,4 @@ drone-server: docker_container.running: {{ drone.server }} -{%- endif %} \ No newline at end of file +{%- endif %} diff --git a/states/fuelprices/init.sls b/states/fuelprices/init.sls index 10ad9a6..e39dc86 100644 --- a/states/fuelprices/init.sls +++ b/states/fuelprices/init.sls @@ -1,3 +1,3 @@ --- include: - - .install \ No newline at end of file + - .install diff --git a/states/fuelprices/install.sls b/states/fuelprices/install.sls index b0acefa..9318965 100644 --- a/states/fuelprices/install.sls +++ b/states/fuelprices/install.sls @@ -13,4 +13,4 @@ fuelprices-binary-symlink: - name: {{ fuelprices.install_dir }}/fuelprices - target: {{ fuelprices.release_dir }}/fuelprices-{{ fuelprices.version }} - require: - - archive: fuelprices-archive-extract \ No newline at end of file + - archive: fuelprices-archive-extract diff --git a/states/fuelprices/kernelmap.yaml b/states/fuelprices/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/fuelprices/kernelmap.yaml +++ b/states/fuelprices/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/fuelprices/osarchmap.yaml b/states/fuelprices/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/fuelprices/osarchmap.yaml +++ b/states/fuelprices/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/g2g/init.sls b/states/g2g/init.sls index 10ad9a6..e39dc86 100644 --- a/states/g2g/init.sls +++ b/states/g2g/init.sls @@ -1,3 +1,3 @@ --- include: - - .install \ No newline at end of file + - .install diff --git a/states/g2g/install.sls b/states/g2g/install.sls index dbb7dce..3b1db504 100644 --- a/states/g2g/install.sls +++ b/states/g2g/install.sls @@ -13,4 +13,4 @@ g2g-binary-symlink: - name: {{ g2g.install_dir }}/g2g - target: {{ g2g.release_dir }}/g2g-{{ g2g.version }} - require: - - archive: g2g-archive-extract \ No newline at end of file + - archive: g2g-archive-extract diff --git a/states/g2g/kernelmap.yaml b/states/g2g/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/g2g/kernelmap.yaml +++ b/states/g2g/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/g2g/osarchmap.yaml b/states/g2g/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/g2g/osarchmap.yaml +++ b/states/g2g/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/gobackup/init.sls b/states/gobackup/init.sls index b91d8ec..d507940 100644 --- a/states/gobackup/init.sls +++ b/states/gobackup/init.sls @@ -1,4 +1,4 @@ --- include: - .install - - .config \ No newline at end of file + - .config diff --git a/states/gobackup/kernelmap.yaml b/states/gobackup/kernelmap.yaml index b01f41d..6d13a9c 100644 --- a/states/gobackup/kernelmap.yaml +++ b/states/gobackup/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: linux \ No newline at end of file + os: linux diff --git a/states/gobackup/osarchmap.yaml b/states/gobackup/osarchmap.yaml index fbaa340..14f769e 100644 --- a/states/gobackup/osarchmap.yaml +++ b/states/gobackup/osarchmap.yaml @@ -18,4 +18,4 @@ arm64: # arch: arm # armhf: -# arch: arm \ No newline at end of file +# arch: arm diff --git a/states/golang/init.sls b/states/golang/init.sls index 10ad9a6..e39dc86 100644 --- a/states/golang/init.sls +++ b/states/golang/init.sls @@ -1,3 +1,3 @@ --- include: - - .install \ No newline at end of file + - .install diff --git a/states/golang/kernelmap.yaml b/states/golang/kernelmap.yaml index 1b57317..09dfe7b 100644 --- a/states/golang/kernelmap.yaml +++ b/states/golang/kernelmap.yaml @@ -9,4 +9,4 @@ FreeBSD: os: "freebsd" NetBSD: - os: "netbsd" \ No newline at end of file + os: "netbsd" diff --git a/states/golang/osarchmap.yaml b/states/golang/osarchmap.yaml index 493bc5a..f6a42da 100644 --- a/states/golang/osarchmap.yaml +++ b/states/golang/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "armv6l" armhf: - arch: "armv6l" \ No newline at end of file + arch: "armv6l" diff --git a/states/gufw/init.sls b/states/gufw/init.sls index 22a2b27..b4c7a8d 100644 --- a/states/gufw/init.sls +++ b/states/gufw/init.sls @@ -13,4 +13,4 @@ gufw-desktop-cfg: - name: /etc/gufw/Desktop.profile - user: root - group: root - - mode: 600 \ No newline at end of file + - mode: 600 diff --git a/states/influxdb/config.sls b/states/influxdb/config.sls index 06a1195..0682647 100644 --- a/states/influxdb/config.sls +++ b/states/influxdb/config.sls @@ -17,4 +17,4 @@ influxdb-config-file: - mode: 644 - template: jinja - watch_in: - - service: influxdb-service \ No newline at end of file + - service: influxdb-service diff --git a/states/influxdb/kernelmap.yaml b/states/influxdb/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/influxdb/kernelmap.yaml +++ b/states/influxdb/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/influxdb/osarchmap.yaml b/states/influxdb/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/influxdb/osarchmap.yaml +++ b/states/influxdb/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/influxdb/v2/influxdb.service_v2.j2 b/states/influxdb/v2/influxdb.service_v2.j2 index b45e998..cd7f940 100644 --- a/states/influxdb/v2/influxdb.service_v2.j2 +++ b/states/influxdb/v2/influxdb.service_v2.j2 @@ -13,4 +13,4 @@ Restart=on-failure [Install] WantedBy=multi-user.target -Alias=influxd.service +Alias=influxd.service \ No newline at end of file diff --git a/states/ipfs/init.sls b/states/ipfs/init.sls index 63261f2..383c46b 100644 --- a/states/ipfs/init.sls +++ b/states/ipfs/init.sls @@ -2,4 +2,4 @@ include: - .install - .config - - .service \ No newline at end of file + - .service diff --git a/states/ipfs/install.sls b/states/ipfs/install.sls index 2f5ebaa..4592a67 100644 --- a/states/ipfs/install.sls +++ b/states/ipfs/install.sls @@ -31,4 +31,4 @@ ipfs-init: - 0 - 1 - watch-in: - - service: ipfs-service \ No newline at end of file + - service: ipfs-service diff --git a/states/ipfs/kernelmap.yaml b/states/ipfs/kernelmap.yaml index 1b57317..09dfe7b 100644 --- a/states/ipfs/kernelmap.yaml +++ b/states/ipfs/kernelmap.yaml @@ -9,4 +9,4 @@ FreeBSD: os: "freebsd" NetBSD: - os: "netbsd" \ No newline at end of file + os: "netbsd" diff --git a/states/ipfs/osarchmap.yaml b/states/ipfs/osarchmap.yaml index 493bc5a..f6a42da 100644 --- a/states/ipfs/osarchmap.yaml +++ b/states/ipfs/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "armv6l" armhf: - arch: "armv6l" \ No newline at end of file + arch: "armv6l" diff --git a/states/ipfs/service.sls b/states/ipfs/service.sls index 7cdd5de..8ac455e 100644 --- a/states/ipfs/service.sls +++ b/states/ipfs/service.sls @@ -11,4 +11,4 @@ ipfs-service: - name: ipfs - enable: true - require: - - file: ipfs-dir \ No newline at end of file + - file: ipfs-dir diff --git a/states/iptables/init.sls b/states/iptables/init.sls index 6bf338b..bcf4cc3 100644 --- a/states/iptables/init.sls +++ b/states/iptables/init.sls @@ -93,4 +93,4 @@ iptables-service: - name: iptables - enable: true - require: - - pkg: iptables-pkg \ No newline at end of file + - pkg: iptables-pkg diff --git a/states/iptables/iptables.sls b/states/iptables/iptables.sls index 5483ce4..5cf6d3c 100644 --- a/states/iptables/iptables.sls +++ b/states/iptables/iptables.sls @@ -89,4 +89,4 @@ iptables-service: - name: iptables - enable: true - require: - - pkg: iptables-pkg \ No newline at end of file + - pkg: iptables-pkg diff --git a/states/java/defaults.yaml b/states/java/defaults.yaml index 239c4c0..800b1a0 100644 --- a/states/java/defaults.yaml +++ b/states/java/defaults.yaml @@ -5,4 +5,4 @@ java: version: "11.0.5" install_dir: /usr/java os: linux - arch: x64 \ No newline at end of file + arch: x64 diff --git a/states/java/init.sls b/states/java/init.sls index 10ad9a6..e39dc86 100644 --- a/states/java/init.sls +++ b/states/java/init.sls @@ -1,3 +1,3 @@ --- include: - - .install \ No newline at end of file + - .install diff --git a/states/java/install.sls b/states/java/install.sls index 795e629..ae33184 100644 --- a/states/java/install.sls +++ b/states/java/install.sls @@ -36,4 +36,4 @@ java_updatealternatives_script: java_default: cmd.run: - - name: {{ java.install_dir }}/default/update-alternatives-java.sh \ No newline at end of file + - name: {{ java.install_dir }}/default/update-alternatives-java.sh diff --git a/states/java/kernelmap.yaml b/states/java/kernelmap.yaml index b01f41d..6d13a9c 100644 --- a/states/java/kernelmap.yaml +++ b/states/java/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: linux \ No newline at end of file + os: linux diff --git a/states/java/osarchmap.yaml b/states/java/osarchmap.yaml index 9c56fe7..304acdf 100644 --- a/states/java/osarchmap.yaml +++ b/states/java/osarchmap.yaml @@ -18,4 +18,4 @@ x86_64: # arch: arm # armhf: -# arch: arm \ No newline at end of file +# arch: arm diff --git a/states/lego/init.sls b/states/lego/init.sls index 10ad9a6..e39dc86 100644 --- a/states/lego/init.sls +++ b/states/lego/init.sls @@ -1,3 +1,3 @@ --- include: - - .install \ No newline at end of file + - .install diff --git a/states/lego/kernelmap.yaml b/states/lego/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/lego/kernelmap.yaml +++ b/states/lego/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/lego/map.jinja b/states/lego/map.jinja index e473081..724d934 100644 --- a/states/lego/map.jinja +++ b/states/lego/map.jinja @@ -11,4 +11,4 @@ ) -%} -{%- set lego = salt['pillar.get']('lego', default=defaults, merge=True) -%} +{%- set lego = salt['pillar.get']('lego', default=defaults, merge=True) -%} \ No newline at end of file diff --git a/states/locale/init.sls b/states/locale/init.sls index 783dc41..0186b9a 100644 --- a/states/locale/init.sls +++ b/states/locale/init.sls @@ -7,4 +7,4 @@ # locale.system: # - name: {{ salt["pillar.get"]("locale")|default("en_US.UTF-8") }} # - require: -# - locale: locale_present +# - locale: locale_present \ No newline at end of file diff --git a/states/maildb/defaults.yaml b/states/maildb/defaults.yaml index 5bfa2af..0a74938 100644 --- a/states/maildb/defaults.yaml +++ b/states/maildb/defaults.yaml @@ -10,4 +10,4 @@ maildb: hostname: localhost username: username password: password - database: maildb \ No newline at end of file + database: maildb diff --git a/states/mariadb/config.sls b/states/mariadb/config.sls index 97b2dc6..a773365 100644 --- a/states/mariadb/config.sls +++ b/states/mariadb/config.sls @@ -12,4 +12,4 @@ mariadb-config: - pkg: mariadb-install-pkgs - pip: mariadb-install-pip-pkgs - watch_in: - - service: mariadb-service \ No newline at end of file + - service: mariadb-service diff --git a/states/mariadb/databases.sls b/states/mariadb/databases.sls index 8e0fd81..da5e8a7 100644 --- a/states/mariadb/databases.sls +++ b/states/mariadb/databases.sls @@ -6,4 +6,4 @@ mariadb-database-{{ value.name }}: - name: {{ value.name }} - connection_user: {{ mariadb.connection_user }} - connection_pass: {{ mariadb.connection_pass }} -{%- endfor %} \ No newline at end of file +{%- endfor %} diff --git a/states/mariadb/defaults.yaml b/states/mariadb/defaults.yaml index a8c0a3f..f810795 100644 --- a/states/mariadb/defaults.yaml +++ b/states/mariadb/defaults.yaml @@ -39,4 +39,4 @@ mariadb: table_open_cache: 400 thread_cache_size: 128 tmp_table_size: 32M - wait_timeout: 600 \ No newline at end of file + wait_timeout: 600 diff --git a/states/mariadb/init.sls b/states/mariadb/init.sls index 43f5f7c..da4837c 100644 --- a/states/mariadb/init.sls +++ b/states/mariadb/init.sls @@ -4,4 +4,4 @@ include: - .config - .service - .databases - - .users \ No newline at end of file + - .users diff --git a/states/mariadb/service.sls b/states/mariadb/service.sls index 2ddb8db..3e1ea60 100644 --- a/states/mariadb/service.sls +++ b/states/mariadb/service.sls @@ -2,4 +2,4 @@ mariadb-service: service.running: - name: mariadb - - enable: true \ No newline at end of file + - enable: true diff --git a/states/netbox/defaults.yaml b/states/netbox/defaults.yaml index 3fb05ac..eaa3569 100644 --- a/states/netbox/defaults.yaml +++ b/states/netbox/defaults.yaml @@ -42,7 +42,7 @@ netbox: database: 0 cache_database: 1 default_timeout: 300 - ssl: False + ssl: false caching: host: "localhost" port: 6379 @@ -50,7 +50,7 @@ netbox: database: 0 cache_database: 1 default_timeout: 300 - ssl: False + ssl: false admins: - ['John Doe', 'jdoe@example.com'] - ['Bob Reptincel', 'breptincel@example.com'] @@ -60,10 +60,10 @@ netbox: base_path: "" cache_timeout: 900 changelog_retention: 90 - cors_origin_allow_all: False + cors_origin_allow_all: false cors_origin_whitelist: [] cors_origin_regex_whitelist: [] - debug: False + debug: false email: server: "localhost" port: 25 @@ -71,27 +71,27 @@ netbox: password: password timeout: 10 from_email: user@domain.com - enforce_global_unique: False + enforce_global_unique: false exempt_view_permissions: [] logging: {} - login_required: False + login_required: false login_timeout: 3600 - maintenance_mode: False + maintenance_mode: false max_page_size: 1000 - metrics_enabled: False + metrics_enabled: false napalm_username: '' napalm_password: '' napalm_timeout: 30 napalm_args: {} paginate_count: 50 - prefer_ipv4: False + prefer_ipv4: false session_file_path: "/tmp" session_cookie_age: 3600 time_zone: "UTC" - webhooks_enabled: False + webhooks_enabled: false date_format: "N j, Y" short_date_format: "Y-m-d" time_format: "g:i a" short_time_format: "H:i:s" datetime_format: "N j, Y g:i a" - short_datetime_format: "Y-m-d H:i" \ No newline at end of file + short_datetime_format: "Y-m-d H:i" diff --git a/states/netbox/init.sls b/states/netbox/init.sls index 131d140..db7aba9 100644 --- a/states/netbox/init.sls +++ b/states/netbox/init.sls @@ -3,4 +3,4 @@ include: - redis - .pkgs - .install - - .service \ No newline at end of file + - .service diff --git a/states/netbox/install.sls b/states/netbox/install.sls index 0b99836..ec9df55 100644 --- a/states/netbox/install.sls +++ b/states/netbox/install.sls @@ -69,4 +69,4 @@ netbox-install-static-files: - pythonpath: {{ netbox.install_dir }}/netbox/netbox - bin_env: {{ netbox.install_dir }}/netbox - require: - - virtualenv: netbox-virtualenv \ No newline at end of file + - virtualenv: netbox-virtualenv diff --git a/states/netbox/pkgs.sls b/states/netbox/pkgs.sls index 8e1e14f..4c83a8a 100644 --- a/states/netbox/pkgs.sls +++ b/states/netbox/pkgs.sls @@ -5,4 +5,4 @@ netbox_pkg_reqs: - pkgs: {%- for pkg in netbox.pkgs %} - {{ pkg }} -{%- endfor %} \ No newline at end of file +{%- endfor %} diff --git a/states/netbox/service.sls b/states/netbox/service.sls index a75555f..2a46b49 100644 --- a/states/netbox/service.sls +++ b/states/netbox/service.sls @@ -10,4 +10,4 @@ netbox-service-file: netbox-service: service.running: - name: netbox - - enable: true \ No newline at end of file + - enable: true diff --git a/states/netboxinventory/defaults.yaml b/states/netboxinventory/defaults.yaml index 3d4a207..7ec7092 100644 --- a/states/netboxinventory/defaults.yaml +++ b/states/netboxinventory/defaults.yaml @@ -3,4 +3,4 @@ netbox: sites: - Caen - Saint-Lo - - Amsterdam \ No newline at end of file + - Amsterdam diff --git a/states/netboxinventory/init.sls b/states/netboxinventory/init.sls index 718b1b7..c7ee36f 100644 --- a/states/netboxinventory/init.sls +++ b/states/netboxinventory/init.sls @@ -28,4 +28,4 @@ netbox.create_device_{{ salt['grains.get']('nodename')|to_camelcase }}: - role: {{ salt['grains.get']('type') }} - manufacturer: default - model: default -{%- endif %} +{%- endif %} \ No newline at end of file diff --git a/states/nextcloud/init.sls b/states/nextcloud/init.sls index 4c9899e..07b0c86 100644 --- a/states/nextcloud/init.sls +++ b/states/nextcloud/init.sls @@ -3,4 +3,4 @@ include: - php - redis - .install - - .config \ No newline at end of file + - .config diff --git a/states/nextcloud/templates/config.php.j2 b/states/nextcloud/templates/config.php.j2 index ec97afc..d6c56c8 100644 --- a/states/nextcloud/templates/config.php.j2 +++ b/states/nextcloud/templates/config.php.j2 @@ -27,4 +27,4 @@ $CONFIG = array( {%- for key, value in nextcloud.config.items() %} "{{ key }}" => {{ mac(value,loop.last) }} {%- endfor %} -); +); \ No newline at end of file diff --git a/states/nextcloud_desktop/init.sls b/states/nextcloud_desktop/init.sls index 7487a47..92bc984 100644 --- a/states/nextcloud_desktop/init.sls +++ b/states/nextcloud_desktop/init.sls @@ -33,4 +33,4 @@ nextcloud-desktop-icon-entry: - source: salt://nextcloud_desktop/nextcloud.desktop - user: root - group: root - - mode: 644 \ No newline at end of file + - mode: 644 diff --git a/states/nextcloud_desktop/nextcloud.desktop b/states/nextcloud_desktop/nextcloud.desktop index bfeafb3..30a6e5a 100644 --- a/states/nextcloud_desktop/nextcloud.desktop +++ b/states/nextcloud_desktop/nextcloud.desktop @@ -7,4 +7,4 @@ Comment=PaulBSD Cloud desktop synchronization client GenericName=Folder Sync Icon=/usr/share/icons/nextcloud.png Keywords=Nextcloud;syncing;file;sharing; -X-GNOME-Autostart-Delay=3 +X-GNOME-Autostart-Delay=3 \ No newline at end of file diff --git a/states/nftables/defaults.yaml b/states/nftables/defaults.yaml index 951d332..9dd24b7 100644 --- a/states/nftables/defaults.yaml +++ b/states/nftables/defaults.yaml @@ -1,4 +1,4 @@ --- nftables: enabled: true - networks: + networks: {} diff --git a/states/nftables/init.sls b/states/nftables/init.sls index 9c6190a..a64ed78 100644 --- a/states/nftables/init.sls +++ b/states/nftables/init.sls @@ -19,4 +19,4 @@ nftables-service: - name: nftables - enable: true - require: - - pkg: nftables-pkg \ No newline at end of file + - pkg: nftables-pkg diff --git a/states/nftables/nftables.conf.j2 b/states/nftables/nftables.conf.j2 index 6013de3..a4577c0 100644 --- a/states/nftables/nftables.conf.j2 +++ b/states/nftables/nftables.conf.j2 @@ -45,4 +45,4 @@ add rule ip6 filter6 input ip6 saddr {{ value.ip }}/{{ value.mask }} ct state es {%- for key, value in net.public_ports.items() %} add rule ip6 filter6 input {{ value.proto }} dport {{ value.port }} ct state established,new counter accept {%- endfor %} -#add rule ip6 filter6 input counter log +#add rule ip6 filter6 input counter log \ No newline at end of file diff --git a/states/npf/defaults.yaml b/states/npf/defaults.yaml index 676c40d..02483f5 100644 --- a/states/npf/defaults.yaml +++ b/states/npf/defaults.yaml @@ -1,3 +1,3 @@ --- npf: - enabled: true \ No newline at end of file + enabled: true diff --git a/states/npf/init.sls b/states/npf/init.sls index 499796d..77e1258 100644 --- a/states/npf/init.sls +++ b/states/npf/init.sls @@ -11,4 +11,4 @@ npf-service: service.running: - name: npf - enable: true - - reload: true \ No newline at end of file + - reload: true diff --git a/states/oldstates/clamav/clamd.conf.j2 b/states/old/clamav/clamd.conf.j2 similarity index 100% rename from states/oldstates/clamav/clamd.conf.j2 rename to states/old/clamav/clamd.conf.j2 diff --git a/states/oldstates/clamav/config.sls b/states/old/clamav/config.sls similarity index 100% rename from states/oldstates/clamav/config.sls rename to states/old/clamav/config.sls diff --git a/states/oldstates/clamav/defaults.yaml b/states/old/clamav/defaults.yaml similarity index 100% rename from states/oldstates/clamav/defaults.yaml rename to states/old/clamav/defaults.yaml diff --git a/states/oldstates/clamav/init.sls b/states/old/clamav/init.sls similarity index 100% rename from states/oldstates/clamav/init.sls rename to states/old/clamav/init.sls diff --git a/states/oldstates/clamav/install.sls b/states/old/clamav/install.sls similarity index 100% rename from states/oldstates/clamav/install.sls rename to states/old/clamav/install.sls diff --git a/states/oldstates/clamav/map.jinja b/states/old/clamav/map.jinja similarity index 100% rename from states/oldstates/clamav/map.jinja rename to states/old/clamav/map.jinja diff --git a/states/oldstates/clamav/service.sls b/states/old/clamav/service.sls similarity index 100% rename from states/oldstates/clamav/service.sls rename to states/old/clamav/service.sls diff --git a/states/oldstates/collectd/collectd.conf.j2 b/states/old/collectd/collectd.conf.j2 similarity index 100% rename from states/oldstates/collectd/collectd.conf.j2 rename to states/old/collectd/collectd.conf.j2 diff --git a/states/oldstates/collectd/config.sls b/states/old/collectd/config.sls similarity index 100% rename from states/oldstates/collectd/config.sls rename to states/old/collectd/config.sls diff --git a/states/oldstates/collectd/init.sls b/states/old/collectd/init.sls similarity index 100% rename from states/oldstates/collectd/init.sls rename to states/old/collectd/init.sls diff --git a/states/oldstates/collectd/install.sls b/states/old/collectd/install.sls similarity index 100% rename from states/oldstates/collectd/install.sls rename to states/old/collectd/install.sls diff --git a/states/oldstates/collectd/service.sls b/states/old/collectd/service.sls similarity index 100% rename from states/oldstates/collectd/service.sls rename to states/old/collectd/service.sls diff --git a/states/oldstates/sensu/agent/agent.yml.j2 b/states/old/sensu/agent/agent.yml.j2 similarity index 100% rename from states/oldstates/sensu/agent/agent.yml.j2 rename to states/old/sensu/agent/agent.yml.j2 diff --git a/states/oldstates/sensu/agent/init.sls b/states/old/sensu/agent/init.sls similarity index 100% rename from states/oldstates/sensu/agent/init.sls rename to states/old/sensu/agent/init.sls diff --git a/states/oldstates/sensu/agent/sensu-agent.service.j2 b/states/old/sensu/agent/sensu-agent.service.j2 similarity index 100% rename from states/oldstates/sensu/agent/sensu-agent.service.j2 rename to states/old/sensu/agent/sensu-agent.service.j2 diff --git a/states/oldstates/sensu/defaults.yaml b/states/old/sensu/defaults.yaml similarity index 100% rename from states/oldstates/sensu/defaults.yaml rename to states/old/sensu/defaults.yaml diff --git a/states/oldstates/sensu/init.sls b/states/old/sensu/init.sls similarity index 100% rename from states/oldstates/sensu/init.sls rename to states/old/sensu/init.sls diff --git a/states/oldstates/sensu/map.jinja b/states/old/sensu/map.jinja similarity index 100% rename from states/oldstates/sensu/map.jinja rename to states/old/sensu/map.jinja diff --git a/states/oldstates/snmp/init.sls b/states/old/snmp/init.sls similarity index 100% rename from states/oldstates/snmp/init.sls rename to states/old/snmp/init.sls diff --git a/states/oldstates/snmp/snmpd.conf.j2 b/states/old/snmp/snmpd.conf.j2 similarity index 100% rename from states/oldstates/snmp/snmpd.conf.j2 rename to states/old/snmp/snmpd.conf.j2 diff --git a/states/opendkim/config.sls b/states/opendkim/config.sls index 8175da5..0c05eae 100644 --- a/states/opendkim/config.sls +++ b/states/opendkim/config.sls @@ -49,4 +49,4 @@ opendkim-config-file: - mode: 644 - template: jinja - watch_in: - - service: opendkim-service \ No newline at end of file + - service: opendkim-service diff --git a/states/opendkim/defaults.yaml b/states/opendkim/defaults.yaml index add16ef..2b321d6 100644 --- a/states/opendkim/defaults.yaml +++ b/states/opendkim/defaults.yaml @@ -9,14 +9,14 @@ opendkim: user: opendkim group: opendkim notify_addr: postmaster@example.com - notify_report: yes + notify_report: 'yes' host: 'localhost' port: 8891 - log_why: yes + log_why: 'yes' canonicalization: 'relaxed/simple' - require_safe_keys: false - syslog: yes - syslog_success: yes + require_safe_keys: 'false' + syslog: 'yes' + syslog_success: 'yes' key: name: mx content: > @@ -46,4 +46,4 @@ opendkim: cg3ZQQKBgQCYN5mgdzjjQ2DQ6lT9V8C60/Etp1L2+UuQvFs29Wq6rSwuoTEiMOzZ HbOcr9HGn7W/ocEZwSaMNB5jbtXuSJ4IInT3+PE1Qu1mbMavyv9yl/Y3saIJ8i1T 3+EflCWWLXEVPTazoBscnjrbDfdJly3DVOn2g0IaerdZFb0w4o1+YA== - -----END RSA PRIVATE KEY-----' \ No newline at end of file + -----END RSA PRIVATE KEY-----' diff --git a/states/opendkim/init.sls b/states/opendkim/init.sls index 1c23bd4..1d21dcb 100644 --- a/states/opendkim/init.sls +++ b/states/opendkim/init.sls @@ -3,4 +3,4 @@ include: - .install - .config - - .service \ No newline at end of file + - .service diff --git a/states/opendkim/install.sls b/states/opendkim/install.sls index f1754da..b076641 100644 --- a/states/opendkim/install.sls +++ b/states/opendkim/install.sls @@ -4,4 +4,4 @@ opendkim-pkg: pkg.latest: - pkgs: - opendkim - - opendkim-tools \ No newline at end of file + - opendkim-tools diff --git a/states/opendkim/service.sls b/states/opendkim/service.sls index f7af859..b640902 100644 --- a/states/opendkim/service.sls +++ b/states/opendkim/service.sls @@ -3,4 +3,4 @@ opendkim-service: service.running: - name: opendkim - - enable: true \ No newline at end of file + - enable: true diff --git a/states/openvpn_client/init.sls b/states/openvpn_client/init.sls index 63261f2..383c46b 100644 --- a/states/openvpn_client/init.sls +++ b/states/openvpn_client/init.sls @@ -2,4 +2,4 @@ include: - .install - .config - - .service \ No newline at end of file + - .service diff --git a/states/openvpn_client/install.sls b/states/openvpn_client/install.sls index 18e459c..a776c20 100644 --- a/states/openvpn_client/install.sls +++ b/states/openvpn_client/install.sls @@ -3,4 +3,4 @@ openvpn-client-install: pkg.installed: - name: openvpn - watch_in: - - service: openvpn-client-service \ No newline at end of file + - service: openvpn-client-service diff --git a/states/openvpn_client/map.jinja b/states/openvpn_client/map.jinja index 4a09c30..cc895d7 100644 --- a/states/openvpn_client/map.jinja +++ b/states/openvpn_client/map.jinja @@ -2,4 +2,4 @@ {%- set defaults = salt['grains.filter_by'](default_settings, default='openvpn_client') -%} -{%- set openvpn_client = salt['pillar.get']('openvpn_client', default=defaults, merge=True) -%} +{%- set openvpn_client = salt['pillar.get']('openvpn_client', default=defaults, merge=True) -%} \ No newline at end of file diff --git a/states/openvpn_client/pass.j2 b/states/openvpn_client/pass.j2 index adff34d..527c662 100644 --- a/states/openvpn_client/pass.j2 +++ b/states/openvpn_client/pass.j2 @@ -4,4 +4,4 @@ {{ client.name }} {{ client.password }} {%- endif -%} -{%- endfor -%} +{%- endfor -%} \ No newline at end of file diff --git a/states/openvpn_client/service.sls b/states/openvpn_client/service.sls index 7a9aeec..2d6b985 100644 --- a/states/openvpn_client/service.sls +++ b/states/openvpn_client/service.sls @@ -2,4 +2,4 @@ openvpn-client-service: service.running: - name: openvpn@vpn - - enable: true \ No newline at end of file + - enable: true diff --git a/states/openvpn_client/vpn.conf.j2 b/states/openvpn_client/vpn.conf.j2 index 964c391..56b3864 100644 --- a/states/openvpn_client/vpn.conf.j2 +++ b/states/openvpn_client/vpn.conf.j2 @@ -26,4 +26,4 @@ persist-tun compress lzo fast-io -auth-user-pass private/pass +auth-user-pass private/pass \ No newline at end of file diff --git a/states/ovh/defaults.yaml b/states/ovh/defaults.yaml index 342be5f..7bf910b 100644 --- a/states/ovh/defaults.yaml +++ b/states/ovh/defaults.yaml @@ -3,4 +3,4 @@ ovh: enabled: true version: '0.5.0' domain: - zones: {} \ No newline at end of file + zones: {} diff --git a/states/ovh/domain.sls b/states/ovh/domain.sls index b1b5983..50182cd 100644 --- a/states/ovh/domain.sls +++ b/states/ovh/domain.sls @@ -11,4 +11,4 @@ ovh-domain-{{ domain }}-{{ "{}-{}-{}".format(record.name, record.type, record.ta - target: {{ record.target }} - ttl: {{ record.ttl|default(0) }} {%- endfor %} -{%- endfor %} \ No newline at end of file +{%- endfor %} diff --git a/states/ovh/init.sls b/states/ovh/init.sls index 6e46cda..756c740 100644 --- a/states/ovh/init.sls +++ b/states/ovh/init.sls @@ -2,4 +2,4 @@ {%- from "ovh/map.jinja" import ovh with context %} include: - .pkg - - .domain \ No newline at end of file + - .domain diff --git a/states/ovh/pkg.sls b/states/ovh/pkg.sls index 07e9c73..f705b97 100644 --- a/states/ovh/pkg.sls +++ b/states/ovh/pkg.sls @@ -2,4 +2,4 @@ {%- from "ovh/map.jinja" import ovh with context %} ovh-install-pkg: pip.installed: - - name: ovh=={{ ovh.version|default('0.5.0') }} \ No newline at end of file + - name: ovh=={{ ovh.version|default('0.5.0') }} diff --git a/states/packer/defaults.yaml b/states/packer/defaults.yaml index 3dfb22b..bcf180a 100644 --- a/states/packer/defaults.yaml +++ b/states/packer/defaults.yaml @@ -5,4 +5,4 @@ packer: mirror: https://releases.hashicorp.com/packer version: "1.5.5" os: linux - arch: amd64 \ No newline at end of file + arch: amd64 diff --git a/states/packer/init.sls b/states/packer/init.sls index 10ad9a6..e39dc86 100644 --- a/states/packer/init.sls +++ b/states/packer/init.sls @@ -1,3 +1,3 @@ --- include: - - .install \ No newline at end of file + - .install diff --git a/states/packer/install.sls b/states/packer/install.sls index 2b62ea0..1a4390e 100644 --- a/states/packer/install.sls +++ b/states/packer/install.sls @@ -5,4 +5,4 @@ packer-archive-extract: - name: {{ packer.install_dir }} - source: {{ packer.mirror }}/{{ packer.version }}/packer_{{ packer.version }}_{{ packer.kernel }}_{{ packer.osarch }}.zip - skip_verify: true - - enforce_toplevel: false \ No newline at end of file + - enforce_toplevel: false diff --git a/states/packer/kernelmap.yaml b/states/packer/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/packer/kernelmap.yaml +++ b/states/packer/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/packer/osarchmap.yaml b/states/packer/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/packer/osarchmap.yaml +++ b/states/packer/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/php/init.sls b/states/php/init.sls index 83c8ed9..b08f014 100644 --- a/states/php/init.sls +++ b/states/php/init.sls @@ -3,4 +3,4 @@ include: - .install - .config - - .service \ No newline at end of file + - .service diff --git a/states/php/install.sls b/states/php/install.sls index 2c64b5a..b5ca785 100644 --- a/states/php/install.sls +++ b/states/php/install.sls @@ -4,4 +4,4 @@ php-pkgs: pkg.latest: - pkgs: {{ php.pkgs }} - watch_in: - - service: php-fpm-service \ No newline at end of file + - service: php-fpm-service diff --git a/states/php/service.sls b/states/php/service.sls index be0bf4b..3636a70 100644 --- a/states/php/service.sls +++ b/states/php/service.sls @@ -3,4 +3,4 @@ php-fpm-service: service.running: - name: php7.3-fpm - enable: true - - reload: true \ No newline at end of file + - reload: true diff --git a/states/pkg/bootstrap.sls b/states/pkg/bootstrap.sls index a4b37ab..739fb12 100644 --- a/states/pkg/bootstrap.sls +++ b/states/pkg/bootstrap.sls @@ -6,4 +6,4 @@ pkg-full-upgrade: pkg-install-apt-transport-https: pkg.latest: - - name: apt-transport-https \ No newline at end of file + - name: apt-transport-https diff --git a/states/pkg/remove.sls b/states/pkg/remove.sls index 8db55b3..17ae499 100644 --- a/states/pkg/remove.sls +++ b/states/pkg/remove.sls @@ -7,4 +7,4 @@ pkg-remove: {%- for pkg in pkg.remove %} - {{ pkg }} {%- endfor %} -{%- endif %} \ No newline at end of file +{%- endif %} diff --git a/states/pki/install.sls b/states/pki/install.sls index e3d6d64..2f3c32b 100644 --- a/states/pki/install.sls +++ b/states/pki/install.sls @@ -17,4 +17,4 @@ pki-binary-symlink: - require: - archive: pki-archive-extract - watch_in: - - service: pki-service \ No newline at end of file + - service: pki-service diff --git a/states/pki/kernelmap.yaml b/states/pki/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/pki/kernelmap.yaml +++ b/states/pki/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/pki/map.jinja b/states/pki/map.jinja index a1ba258..51fe41d 100644 --- a/states/pki/map.jinja +++ b/states/pki/map.jinja @@ -11,4 +11,4 @@ ) -%} -{%- set pki = salt['pillar.get']('pki', default=defaults, merge=True) -%} +{%- set pki = salt['pillar.get']('pki', default=defaults, merge=True) -%} \ No newline at end of file diff --git a/states/pki/osarchmap.yaml b/states/pki/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/pki/osarchmap.yaml +++ b/states/pki/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/pki/pki.service.j2 b/states/pki/pki.service.j2 index e94b5d2..5a398d6 100644 --- a/states/pki/pki.service.j2 +++ b/states/pki/pki.service.j2 @@ -9,4 +9,4 @@ Type=simple ExecStart={{ pki.install_dir }}/pki/pki -configfile {{ pki.install_dir }}/config/common.ini -port {{ pki.port }} [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target \ No newline at end of file diff --git a/states/postfix/init.sls b/states/postfix/init.sls index 9fef97f..0e2a13c 100644 --- a/states/postfix/init.sls +++ b/states/postfix/init.sls @@ -4,4 +4,4 @@ include: - .install - .config - .maps - - .service \ No newline at end of file + - .service diff --git a/states/postfix/install.sls b/states/postfix/install.sls index 86b3cba..6522be3 100644 --- a/states/postfix/install.sls +++ b/states/postfix/install.sls @@ -2,4 +2,4 @@ {%- from "postfix/map.jinja" import postfix with context %} postfix-pkg: pkg.latest: - - pkgs: {{ postfix.pkgs }} \ No newline at end of file + - pkgs: {{ postfix.pkgs }} diff --git a/states/postfix/map.jinja b/states/postfix/map.jinja index 3c6175a..9982e4e 100644 --- a/states/postfix/map.jinja +++ b/states/postfix/map.jinja @@ -5,4 +5,4 @@ default=defaults.postfix, merge=True ) --%} +-%} \ No newline at end of file diff --git a/states/postfix/maps.sls b/states/postfix/maps.sls index 943ded4..d5a0af6 100644 --- a/states/postfix/maps.sls +++ b/states/postfix/maps.sls @@ -32,4 +32,4 @@ postfix-transport: postfix-sender-access: cmd.run: - name: postmap sender_access - - cwd: {{ postfix.base_dir }} \ No newline at end of file + - cwd: {{ postfix.base_dir }} diff --git a/states/postfix/service.sls b/states/postfix/service.sls index 092c0b1..9beb895 100644 --- a/states/postfix/service.sls +++ b/states/postfix/service.sls @@ -4,4 +4,4 @@ postfix-service: service.running: - name: postfix - enable: true - - reload: true \ No newline at end of file + - reload: true diff --git a/states/postfix/templates/master.cf.j2 b/states/postfix/templates/master.cf.j2 index bcf257e..14c550b 100644 --- a/states/postfix/templates/master.cf.j2 +++ b/states/postfix/templates/master.cf.j2 @@ -46,4 +46,4 @@ maildb unix - n n - - pipe 127.0.0.1:10025 inet n - n - - smtpd -o content_filter= -o mynetworks=127.0.0.0/8 - -o smtpd_recipient_restrictions=permit_mynetworks,reject + -o smtpd_recipient_restrictions=permit_mynetworks,reject \ No newline at end of file diff --git a/states/pycharm/init.sls b/states/pycharm/init.sls index 10ad9a6..e39dc86 100644 --- a/states/pycharm/init.sls +++ b/states/pycharm/init.sls @@ -1,3 +1,3 @@ --- include: - - .install \ No newline at end of file + - .install diff --git a/states/pycharm/install.sls b/states/pycharm/install.sls index 39026c0..2f729e6 100644 --- a/states/pycharm/install.sls +++ b/states/pycharm/install.sls @@ -25,4 +25,3 @@ pycharm-shortcut: - user: root - group: root - mode: 644 - diff --git a/states/qrz/init.sls b/states/qrz/init.sls index b07358d..b71e4b0 100644 --- a/states/qrz/init.sls +++ b/states/qrz/init.sls @@ -1,4 +1,4 @@ --- include: - .install - - .service \ No newline at end of file + - .service diff --git a/states/qrz/install.sls b/states/qrz/install.sls index 824568f..ca0a242 100644 --- a/states/qrz/install.sls +++ b/states/qrz/install.sls @@ -17,4 +17,4 @@ qrz-binary-symlink: - require: - archive: qrz-archive-extract - watch_in: - - service: qrz-service \ No newline at end of file + - service: qrz-service diff --git a/states/qrz/kernelmap.yaml b/states/qrz/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/qrz/kernelmap.yaml +++ b/states/qrz/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/qrz/osarchmap.yaml b/states/qrz/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/qrz/osarchmap.yaml +++ b/states/qrz/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/qrz/qrz.service.j2 b/states/qrz/qrz.service.j2 index 5f46d75..7d74070 100644 --- a/states/qrz/qrz.service.j2 +++ b/states/qrz/qrz.service.j2 @@ -9,4 +9,4 @@ Type=simple ExecStart={{ qrz.install_dir }}/qrz/qrz -configfile {{ qrz.install_dir }}/config/common.ini -port {{ qrz.port }} [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target \ No newline at end of file diff --git a/states/qrz/service.sls b/states/qrz/service.sls index e480876..622afa0 100644 --- a/states/qrz/service.sls +++ b/states/qrz/service.sls @@ -11,4 +11,4 @@ qrz-service-file: qrz-service: service.running: - name: qrz - - enable: true \ No newline at end of file + - enable: true diff --git a/states/rainloop/config.sls b/states/rainloop/config.sls index 140a5c8..73b314f 100644 --- a/states/rainloop/config.sls +++ b/states/rainloop/config.sls @@ -1,3 +1 @@ ---- -rainloop-config: - +--- \ No newline at end of file diff --git a/states/rainloop/map.jinja b/states/rainloop/map.jinja index 522db3b..10b40be 100644 --- a/states/rainloop/map.jinja +++ b/states/rainloop/map.jinja @@ -2,4 +2,4 @@ {%- set defaults = salt['grains.filter_by'](default_settings, default='rainloop') -%} -{%- set rainloop = salt['pillar.get']('rainloop', default=defaults, merge=True) -%} +{%- set rainloop = salt['pillar.get']('rainloop', default=defaults, merge=True) -%} \ No newline at end of file diff --git a/states/rclone/defaults.yaml b/states/rclone/defaults.yaml index 5058dae..5538dbe 100644 --- a/states/rclone/defaults.yaml +++ b/states/rclone/defaults.yaml @@ -6,4 +6,4 @@ rclone: mirror: https://downloads.rclone.org version: v1.50.2 os: linux - arch: amd64 \ No newline at end of file + arch: amd64 diff --git a/states/rclone/init.sls b/states/rclone/init.sls index 10ad9a6..e39dc86 100644 --- a/states/rclone/init.sls +++ b/states/rclone/init.sls @@ -1,3 +1,3 @@ --- include: - - .install \ No newline at end of file + - .install diff --git a/states/rclone/kernelmap.yaml b/states/rclone/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/rclone/kernelmap.yaml +++ b/states/rclone/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/rclone/osarchmap.yaml b/states/rclone/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/rclone/osarchmap.yaml +++ b/states/rclone/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/redis/defaults.yaml b/states/redis/defaults.yaml index 18e5e68..119c625 100644 --- a/states/redis/defaults.yaml +++ b/states/redis/defaults.yaml @@ -1,2 +1,2 @@ --- -redis: \ No newline at end of file +redis: {} diff --git a/states/redis/init.sls b/states/redis/init.sls index b07358d..b71e4b0 100644 --- a/states/redis/init.sls +++ b/states/redis/init.sls @@ -1,4 +1,4 @@ --- include: - .install - - .service \ No newline at end of file + - .service diff --git a/states/redis/install.sls b/states/redis/install.sls index f724236..c72b997 100644 --- a/states/redis/install.sls +++ b/states/redis/install.sls @@ -1,4 +1,4 @@ --- redis-install: pkg.latest: - - name: redis-server \ No newline at end of file + - name: redis-server diff --git a/states/redis/service.sls b/states/redis/service.sls index e7e8062..17e5d3b 100644 --- a/states/redis/service.sls +++ b/states/redis/service.sls @@ -2,4 +2,4 @@ redis-service: service.running: - name: redis - - enable: true \ No newline at end of file + - enable: true diff --git a/states/rspamd/defaults.yaml b/states/rspamd/defaults.yaml index 5c38334..9ba4ffe 100644 --- a/states/rspamd/defaults.yaml +++ b/states/rspamd/defaults.yaml @@ -2,4 +2,4 @@ rspamd: config: dir: /etc/rspamd - files: {} \ No newline at end of file + files: {} diff --git a/states/rsync/defaults.yaml b/states/rsync/defaults.yaml index 78fdfdb..e98317e 100644 --- a/states/rsync/defaults.yaml +++ b/states/rsync/defaults.yaml @@ -13,4 +13,4 @@ rsync: - name: 'tmp' settings: path: '/tmp' - read only: 'yes' \ No newline at end of file + read only: 'yes' diff --git a/states/rsyslog/rsyslog.conf.j2 b/states/rsyslog/rsyslog.conf.j2 index 05f65da..9e21975 100644 --- a/states/rsyslog/rsyslog.conf.j2 +++ b/states/rsyslog/rsyslog.conf.j2 @@ -43,4 +43,4 @@ mail.err /var/log/mail.err *.emerg :omusrmsg:* -*.* @localhost:6514;RSYSLOG_SyslogProtocol23Format +*.* @localhost:6514;RSYSLOG_SyslogProtocol23Format \ No newline at end of file diff --git a/states/salt_minion/defaults.yaml b/states/salt_minion/defaults.yaml index e1d9802..205eb06 100644 --- a/states/salt_minion/defaults.yaml +++ b/states/salt_minion/defaults.yaml @@ -4,11 +4,11 @@ salt_minion: version: 3000 config: master: salt.paulbsd.com - #hash_type: sha256 - #state_verbose: True - #tcp_keepalive: True - #tcp_keepalive_idle: 300 - #random_reauth_delay: 60 - #recon_default: 1000 - #recon_max: 10000 - #recon_randomize: True + # hash_type: sha256 + # state_verbose: True + # tcp_keepalive: True + # tcp_keepalive_idle: 300 + # random_reauth_delay: 60 + # recon_default: 1000 + # recon_max: 10000 + # recon_randomize: True diff --git a/states/salt_minion/service.sls b/states/salt_minion/service.sls index 0b3a9e6..798283f 100644 --- a/states/salt_minion/service.sls +++ b/states/salt_minion/service.sls @@ -12,4 +12,4 @@ salt-minion-service-file: salt-minion-service: service.running: - name: salt-minion - - enable: True + - enable: true diff --git a/states/samba/config.sls b/states/samba/config.sls index 4ae7e3d..d0c3d81 100644 --- a/states/samba/config.sls +++ b/states/samba/config.sls @@ -3,4 +3,4 @@ samba-config: ini_manage.options_present: - name: /etc/samba/smb.conf - - sections: {{ samba.config }} \ No newline at end of file + - sections: {{ samba.config }} diff --git a/states/samba/defaults.yaml b/states/samba/defaults.yaml index 98df44b..38d17e5 100644 --- a/states/samba/defaults.yaml +++ b/states/samba/defaults.yaml @@ -1,4 +1,4 @@ --- samba: enabled: true - config: \ No newline at end of file + config: {} diff --git a/states/samba/install.sls b/states/samba/install.sls index 9019917..342f8a1 100644 --- a/states/samba/install.sls +++ b/states/samba/install.sls @@ -5,4 +5,4 @@ samba-pkg: - pkgs: - samba - samba-common - - smbclient \ No newline at end of file + - smbclient diff --git a/states/samba/users.sls b/states/samba/users.sls index ce9d366..929375e 100644 --- a/states/samba/users.sls +++ b/states/samba/users.sls @@ -15,4 +15,4 @@ samba-user-{{ user.name }}: - password_hashed: false - require: - pkg: samba-pkg -{%- endfor %} \ No newline at end of file +{%- endfor %} diff --git a/states/ssh/defaults.yaml b/states/ssh/defaults.yaml index ec5ba21..576b521 100644 --- a/states/ssh/defaults.yaml +++ b/states/ssh/defaults.yaml @@ -15,4 +15,4 @@ ssh: AllowGroups: admin X11Forwarding: 'yes' ssh_config: - ForwardAgent: yes + ForwardAgent: 'yes' diff --git a/states/ssh/init.sls b/states/ssh/init.sls index 63261f2..383c46b 100644 --- a/states/ssh/init.sls +++ b/states/ssh/init.sls @@ -2,4 +2,4 @@ include: - .install - .config - - .service \ No newline at end of file + - .service diff --git a/states/ssh/map.jinja b/states/ssh/map.jinja index bc2a2c5..594817e 100644 --- a/states/ssh/map.jinja +++ b/states/ssh/map.jinja @@ -2,4 +2,4 @@ {%- set defaults = salt['grains.filter_by'](default_settings, default='ssh') -%} -{%- set ssh = salt['pillar.get']('ssh', default=defaults, merge=True) %} +{%- set ssh = salt['pillar.get']('ssh', default=defaults, merge=True) %} \ No newline at end of file diff --git a/states/ssh/ssh_config.j2 b/states/ssh/ssh_config.j2 index 8111f0d..cc80fb0 100644 --- a/states/ssh/ssh_config.j2 +++ b/states/ssh/ssh_config.j2 @@ -4,4 +4,4 @@ {%- for key, value in ssh.ssh_config.items() %} {{ key }} {{ value }} -{%- endfor %} +{%- endfor %} \ No newline at end of file diff --git a/states/ssh/sshd_config.j2 b/states/ssh/sshd_config.j2 index d4b6f7b..024a0b2 100644 --- a/states/ssh/sshd_config.j2 +++ b/states/ssh/sshd_config.j2 @@ -18,4 +18,4 @@ Match Address {{ net4|join(',') }} PasswordAuthentication yes Match Address {{ net6|join(',') }} - PasswordAuthentication yes + PasswordAuthentication yes \ No newline at end of file diff --git a/states/states/defaults.yaml b/states/states/defaults.yaml index a4e0ea2..44945d0 100644 --- a/states/states/defaults.yaml +++ b/states/states/defaults.yaml @@ -1,2 +1,2 @@ --- -states: {} \ No newline at end of file +states: {} diff --git a/states/sublimetext/install.sls b/states/sublimetext/install.sls index a94edc9..c6a3d28 100644 --- a/states/sublimetext/install.sls +++ b/states/sublimetext/install.sls @@ -54,4 +54,3 @@ sublimetext-desktop-entry: - mode: 0644 - require: - archive: sublimetext-extract-archive - diff --git a/states/sublimetext/kernelmap.yaml b/states/sublimetext/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/sublimetext/kernelmap.yaml +++ b/states/sublimetext/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/sublimetext/osarchmap.yaml b/states/sublimetext/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/sublimetext/osarchmap.yaml +++ b/states/sublimetext/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/sudo/sudoers.j2 b/states/sudo/sudoers.j2 index 8f5e114..3840770 100644 --- a/states/sudo/sudoers.j2 +++ b/states/sudo/sudoers.j2 @@ -14,4 +14,4 @@ Defaults {{ default }} {%- endfor %} {%- endif %} -#includedir /etc/sudoers.d +#includedir /etc/sudoers.d \ No newline at end of file diff --git a/states/telegraf/kernelmap.yaml b/states/telegraf/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/telegraf/kernelmap.yaml +++ b/states/telegraf/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/telegraf/osarchmap.yaml b/states/telegraf/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/telegraf/osarchmap.yaml +++ b/states/telegraf/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/time/defaults.yaml b/states/time/defaults.yaml index 8a803d5..cdd07ab 100644 --- a/states/time/defaults.yaml +++ b/states/time/defaults.yaml @@ -1,4 +1,7 @@ --- time: zone: Europe/Paris - server: fr.pool.ntp.org \ No newline at end of file + server: fr.pool.ntp.org + pkgs: + - ntp + - ntpdate diff --git a/states/time/install.sls b/states/time/install.sls index af2f81c..dc18d3f 100644 --- a/states/time/install.sls +++ b/states/time/install.sls @@ -2,4 +2,4 @@ {%- from "time/map.jinja" import time with context %} time-pkgs: pkg.latest: - - pkgs: ['ntp', 'ntpdate'] + - pkgs: {{ time.pkgs }} diff --git a/states/tor/defaults.yaml b/states/tor/defaults.yaml index 63b94df..bbc84a1 100644 --- a/states/tor/defaults.yaml +++ b/states/tor/defaults.yaml @@ -7,4 +7,4 @@ tor: exit_port: '4443' exit_policy: 'reject *:*' nickname: 'anonymous' - syscontact: 'anonymous@example.com' \ No newline at end of file + syscontact: 'anonymous@example.com' diff --git a/states/tor/torrc.j2 b/states/tor/torrc.j2 index 4de1ed0..3a985c4 100644 --- a/states/tor/torrc.j2 +++ b/states/tor/torrc.j2 @@ -6,4 +6,4 @@ ORPort {{ tor.config.exit_port }} SocksPort {{ tor.config.client_host }}:{{ tor.config.client_port }} ExitPolicy {{ tor.config.exit_policy }} Nickname {{ tor.config.nickname }} -ContactInfo {{ tor.config.syscontact }} +ContactInfo {{ tor.config.syscontact }} \ No newline at end of file diff --git a/states/transmission/defaults.yaml b/states/transmission/defaults.yaml index 0555f59..e71aeab 100644 --- a/states/transmission/defaults.yaml +++ b/states/transmission/defaults.yaml @@ -70,4 +70,4 @@ transmission: upload-limit: 100 upload-limit-enabled: 0 upload-slots-per-torrent: 14 - utp-enabled: true \ No newline at end of file + utp-enabled: true diff --git a/states/transmission/settings.json.j2 b/states/transmission/settings.json.j2 index d4405d5..2121fce 100644 --- a/states/transmission/settings.json.j2 +++ b/states/transmission/settings.json.j2 @@ -1,2 +1,2 @@ {%- from "transmission/map.jinja" import transmission with context -%} -{{ transmission.config|tojson }} +{{ transmission.config|tojson }} \ No newline at end of file diff --git a/states/users/defaults.yaml b/states/users/defaults.yaml index 9067c8e..778d161 100644 --- a/states/users/defaults.yaml +++ b/states/users/defaults.yaml @@ -1,3 +1,3 @@ --- users: [] -groups: [] \ No newline at end of file +groups: [] diff --git a/states/vim/vimrc.j2 b/states/vim/vimrc.j2 index 3f74937..50afed9 100644 --- a/states/vim/vimrc.j2 +++ b/states/vim/vimrc.j2 @@ -31,4 +31,4 @@ let g:NERDTreeMinimalUI = 1 let g:NERDTreeIgnore = [] let g:NERDTreeStatusline = '' autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif -nnoremap :NERDTreeToggle +nnoremap :NERDTreeToggle \ No newline at end of file diff --git a/states/vsftpd/vsftpd.conf.j2 b/states/vsftpd/vsftpd.conf.j2 index 8968387..63064ad 100644 --- a/states/vsftpd/vsftpd.conf.j2 +++ b/states/vsftpd/vsftpd.conf.j2 @@ -1,7 +1,6 @@ ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} - {%- from "vsftpd/map.jinja" import vsftpd with context %} {%- for key, value in vsftpd.config.items() %} {{ key }}={{ value }} -{%- endfor %} +{%- endfor %} \ No newline at end of file diff --git a/states/weather/kernelmap.yaml b/states/weather/kernelmap.yaml index e368b24..40943f2 100644 --- a/states/weather/kernelmap.yaml +++ b/states/weather/kernelmap.yaml @@ -1,3 +1,3 @@ --- Linux: - os: "linux" \ No newline at end of file + os: "linux" diff --git a/states/weather/osarchmap.yaml b/states/weather/osarchmap.yaml index c12e349..4bd82f8 100644 --- a/states/weather/osarchmap.yaml +++ b/states/weather/osarchmap.yaml @@ -18,4 +18,4 @@ armv7l: arch: "arm" armhf: - arch: "arm" \ No newline at end of file + arch: "arm" diff --git a/states/website/defaults.yaml b/states/website/defaults.yaml index 7a153c7..064c804 100644 --- a/states/website/defaults.yaml +++ b/states/website/defaults.yaml @@ -4,4 +4,4 @@ website: install_dir: /usr/local/apps release_dir: /usr/local/apps/releases mirror: https://git.paulbsd.com/paulbsd/website/releases/download - version: 1.0.0 \ No newline at end of file + version: 1.0.0 diff --git a/states/winpkg/bootstrap.sls b/states/winpkg/bootstrap.sls index ea97ec6..c7ddacd 100644 --- a/states/winpkg/bootstrap.sls +++ b/states/winpkg/bootstrap.sls @@ -1,4 +1,4 @@ --- chocolatey_bootstrap: module.run: - - name: chocolatey.bootstrap \ No newline at end of file + - name: chocolatey.bootstrap diff --git a/states/winpkg/defaults.yaml b/states/winpkg/defaults.yaml index 58faa87..f92b395 100644 --- a/states/winpkg/defaults.yaml +++ b/states/winpkg/defaults.yaml @@ -1,3 +1,3 @@ --- winpkg: - pkgs: [] \ No newline at end of file + pkgs: [] diff --git a/states/winpkg/init.sls b/states/winpkg/init.sls index aaba48e..0d5dd85 100644 --- a/states/winpkg/init.sls +++ b/states/winpkg/init.sls @@ -1,4 +1,4 @@ --- include: - .bootstrap - - .install \ No newline at end of file + - .install diff --git a/states/winpkg/install.sls b/states/winpkg/install.sls index 8b49aaf..a3db025 100644 --- a/states/winpkg/install.sls +++ b/states/winpkg/install.sls @@ -6,4 +6,4 @@ winpkg-{{ pkg }}: - name: {{ pkg }} - require: - module: chocolatey_bootstrap -{%- endfor %} \ No newline at end of file +{%- endfor %} diff --git a/states/youtubedl/defaults.yaml b/states/youtubedl/defaults.yaml index b3062bf..0b10fc5 100644 --- a/states/youtubedl/defaults.yaml +++ b/states/youtubedl/defaults.yaml @@ -1,4 +1,4 @@ --- youtubedl: - install_dir: "/usr/bin" - version: "2020.03.24" \ No newline at end of file + install_dir: /usr/bin + version: 2020.03.24 diff --git a/states/zabbix/defaults.yaml b/states/zabbix/defaults.yaml index 42c9618..9f27bcd 100644 --- a/states/zabbix/defaults.yaml +++ b/states/zabbix/defaults.yaml @@ -22,8 +22,8 @@ zabbix: pkgs: - python3-pyzabbix - zabbix-agent - #- zabbix-get - #- zabbix-sender + # - zabbix-get + # - zabbix-sender config: Hostname: localhost Include: "/etc/zabbix/zabbix_agentd.conf.d/*.conf" diff --git a/states/zsh/defaults.yaml b/states/zsh/defaults.yaml index 81cf240..7aa63cf 100644 --- a/states/zsh/defaults.yaml +++ b/states/zsh/defaults.yaml @@ -1,4 +1,4 @@ --- zsh: enabled: true - config: \ No newline at end of file + config: {} diff --git a/states/zsh/zprofile.j2 b/states/zsh/zprofile.j2 index 2d84c22..f8f421f 100644 --- a/states/zsh/zprofile.j2 +++ b/states/zsh/zprofile.j2 @@ -52,4 +52,4 @@ fi # Misc settings bindkey -e -unsetopt share_history +unsetopt share_history \ No newline at end of file