From 4f7e38fb347520e1c6ea86a99cf26f6c281a8057 Mon Sep 17 00:00:00 2001 From: Paul Lecuq Date: Sat, 12 Sep 2020 17:41:35 +0200 Subject: [PATCH] updated booleans in sls files --- states/acme/init.sls | 2 +- states/androidstudio/init.sls | 4 ++-- states/apt/init.sls | 2 +- states/arduino/init.sls | 8 ++++---- states/bareos/bareos-fd.sls | 4 ++-- states/bareos/install.sls | 2 +- states/bareos/service.sls | 2 +- states/cds/install.sls | 2 +- states/cds/service.sls | 2 +- states/coronafana/install.sls | 4 ++-- states/dip/install.sls | 4 ++-- states/dip/service.sls | 2 +- states/dkron/install.sls | 4 ++-- states/dkron/service.sls | 2 +- states/docker/service.sls | 2 +- states/dokuwiki/install.sls | 4 ++-- states/dovecot/service.sls | 2 +- states/fuelprices/install.sls | 4 ++-- states/g2g/install.sls | 4 ++-- states/gitea/config.sls | 2 +- states/gitea/install.sls | 4 ++-- states/gitea/service.sls | 6 +++--- states/gobackup/install.sls | 2 +- states/golang/install.sls | 6 +++--- states/influxdb/install.sls | 8 ++++---- states/influxdb/service.sls | 2 +- states/ipfs/init.sls | 6 +++--- states/iptables/init.sls | 2 +- states/iptables/iptables.sls | 2 +- states/java/install.sls | 4 ++-- states/maildb/maildb.py | 8 ++++---- states/mariadb/service.sls | 2 +- states/netbox/install.sls | 2 +- states/netbox/service.sls | 2 +- states/nextcloud/install.sls | 6 +++--- states/nextcloud_desktop/init.sls | 4 ++-- states/nftables/init.sls | 2 +- states/nginx/service.sls | 4 ++-- states/npf/init.sls | 4 ++-- states/opendkim/service.sls | 2 +- states/openvpn_client/service.sls | 2 +- states/packer/install.sls | 4 ++-- states/php/service.sls | 4 ++-- states/pkg/bootstrap.sls | 2 +- states/pkg/install.sls | 2 +- states/postfix/service.sls | 4 ++-- states/postgresql/service.sls | 2 +- states/provision/init.sls | 6 +++--- states/pycharm/init.sls | 2 +- states/qrz/install.sls | 4 ++-- states/qrz/service.sls | 2 +- states/rclone/install.sls | 6 +++--- states/redis/service.sls | 2 +- states/repos/init.sls | 4 ++-- states/rspamd/service.sls | 2 +- states/rsync/service.sls | 2 +- states/rsyslog/service.sls | 2 +- states/samba/users.sls | 2 +- states/services/init.sls | 4 ++-- states/ssh/service.sls | 4 ++-- states/sublimetext/init.sls | 2 +- states/syncthing/config_old.sls | 2 +- states/syncthing/install.sls | 4 ++-- states/syncthing/service.sls | 2 +- states/telegraf/install.sls | 4 ++-- states/telegraf/service.sls | 2 +- states/telegram/install.sls | 10 +++++----- states/tests/repo.sls | 4 ++-- states/time/service.sls | 2 +- states/time/timezone.sls | 2 +- states/transmission/config.sls | 2 +- states/transmission/service.sls | 2 +- states/users/users.sls | 4 ++-- states/vim/install.sls | 4 ++-- states/vim/plugins.sls | 2 +- states/vim/themes.sls | 2 +- states/vsftpd/init.sls | 2 +- states/weather/install.sls | 4 ++-- states/website/install.sls | 4 ++-- 79 files changed, 131 insertions(+), 131 deletions(-) diff --git a/states/acme/init.sls b/states/acme/init.sls index 72d1d77..723de46 100644 --- a/states/acme/init.sls +++ b/states/acme/init.sls @@ -24,7 +24,7 @@ acme-upgrade: acme-directories-{{ dir }}: file.directory: - name: {{ dir }} - - makedirs: True + - makedirs: true {%- endfor %} acme-dh-params: diff --git a/states/androidstudio/init.sls b/states/androidstudio/init.sls index cf8e776..88598af 100644 --- a/states/androidstudio/init.sls +++ b/states/androidstudio/init.sls @@ -7,9 +7,9 @@ androidstudio-archive-extract: archive.extracted: - name: {{ androidstudio.install_dir }} - source: {{ androidstudio.mirror }}/{{ androidstudio.version }}/android-studio-ide-{{ androidstudio.tag }}-linux.tar.gz - - skip_verify: True + - skip_verify: true - archive_format: tar - - overwrite: True + - overwrite: true androidstudio-shortcut: file.managed: diff --git a/states/apt/init.sls b/states/apt/init.sls index 0eefb0e..311dbf3 100644 --- a/states/apt/init.sls +++ b/states/apt/init.sls @@ -12,7 +12,7 @@ apt-aptitude-install: # # apt-upgrade: # pkg.uptodate: -# - refresh: True +# - refresh: true # #apt-cacher-ng-proxy: # file.managed: diff --git a/states/arduino/init.sls b/states/arduino/init.sls index d55d903..f1e7157 100644 --- a/states/arduino/init.sls +++ b/states/arduino/init.sls @@ -5,16 +5,16 @@ arduino-archive-extract: archive.extracted: - name: {{ arduino.install_dir }} - source: {{ arduino.mirror }}/arduino-{{ arduino.version }}-{{ arduino.arch }}.tar.xz - - skip_verify: True + - skip_verify: true - archive_format: tar - - keep: True + - keep: true - if_missing: {{ arduino.install_dir }}/arduino-{{ arduino.version }} arduino-symlink: file.symlink: - name: {{ arduino.install_dir }}/arduino - target: {{ arduino.install_dir }}/arduino-{{ arduino.version }} - - force: True + - force: true - onchanges: - arduino-archive-extract @@ -22,7 +22,7 @@ arduino-bin-symlink: file.symlink: - name: /usr/bin/arduino - target: {{ arduino.install_dir }}/arduino-{{ arduino.version }}/arduino - - force: True + - force: true - onchanges: - arduino-archive-extract diff --git a/states/bareos/bareos-fd.sls b/states/bareos/bareos-fd.sls index 5ff04f1..69b75e7 100644 --- a/states/bareos/bareos-fd.sls +++ b/states/bareos/bareos-fd.sls @@ -11,7 +11,7 @@ bareos-fd-bin: file.managed: - name: /usr/sbin/bareos-fd - source: https://paulbsd-pub.s3.fr-par.scw.cloud/bareos/static-bareos-fd-{{ salt['grains.get']('osarch')|lower }} - - skip_verify: True + - skip_verify: true - user: root - group: root - mode: 0755 @@ -53,7 +53,7 @@ bareos-fd-config: bareos-fd-service: service.running: - name: bareos-fd - - enable: True + - enable: true - require: - file: bareos-fd-service-file {%- endif %} \ No newline at end of file diff --git a/states/bareos/install.sls b/states/bareos/install.sls index 4afb8a9..50858d7 100644 --- a/states/bareos/install.sls +++ b/states/bareos/install.sls @@ -11,7 +11,7 @@ bareos-fd-bin: file.managed: - name: /usr/sbin/bareos-fd - source: {{ bareos.mirror }}/static-bareos-fd-{{ bareos.arch }} - - skip_verify: True + - skip_verify: true - user: root - group: root - mode: 0755 \ No newline at end of file diff --git a/states/bareos/service.sls b/states/bareos/service.sls index 4ac5266..f9c0320 100644 --- a/states/bareos/service.sls +++ b/states/bareos/service.sls @@ -15,6 +15,6 @@ bareos-fd-service-file: bareos-fd-service: service.running: - name: bareos-fd - - enable: True + - enable: true - require: - file: bareos-fd-service-file \ No newline at end of file diff --git a/states/cds/install.sls b/states/cds/install.sls index fef6edc..06c68c7 100644 --- a/states/cds/install.sls +++ b/states/cds/install.sls @@ -4,7 +4,7 @@ cds-engine-install: file.managed: - name: /usr/bin/cds-engine-{{ salt['pillar.get']('cds:engine:version') }} - source: {{ cds.mirror }}/{{ cds.version }}/cds-engine-{{ salt['grains.get']('kernel')|lower }}-{{ salt['grains.get']('osarch') }} - - skip_verify: True + - skip_verify: true cds-bin-symlink: file.symlink: diff --git a/states/cds/service.sls b/states/cds/service.sls index 5ecf308..3818c6d 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 \ No newline at end of file diff --git a/states/coronafana/install.sls b/states/coronafana/install.sls index 227ae2a..9fdcd3d 100644 --- a/states/coronafana/install.sls +++ b/states/coronafana/install.sls @@ -4,8 +4,8 @@ coronafana-archive-extract: archive.extracted: - name: {{ coronafana.release_dir }}/coronafana-{{ coronafana.version }} - source: {{ coronafana.mirror }}/{{ coronafana.version }}/coronafana-{{ coronafana.version }}-{{ coronafana.os }}-{{ coronafana.arch }}.tar.gz - - skip_verify: True - - enforce_toplevel: False + - skip_verify: true + - enforce_toplevel: false - if_missing: {{ coronafana.release_dir }}/coronafana-{{ coronafana.version }} coronafana-binary-symlink: diff --git a/states/dip/install.sls b/states/dip/install.sls index 4a2d7ab..1833319 100644 --- a/states/dip/install.sls +++ b/states/dip/install.sls @@ -4,8 +4,8 @@ dip-archive-extract: archive.extracted: - name: {{ dip.release_dir }}/dip-{{ dip.version }} - source: {{ dip.mirror }}/{{ dip.version }}/dip-{{ dip.version }}-{{ dip.os }}-{{ dip.arch }}.tar.gz - - skip_verify: True - - enforce_toplevel: False + - skip_verify: true + - enforce_toplevel: false - if_missing: {{ dip.release_dir }}/dip-{{ dip.version }} - watch_in: - service: dip-service diff --git a/states/dip/service.sls b/states/dip/service.sls index c94c38f..79d0fee 100644 --- a/states/dip/service.sls +++ b/states/dip/service.sls @@ -11,4 +11,4 @@ dip-service-file: dip-service: service.running: - name: dip - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/dkron/install.sls b/states/dkron/install.sls index 99828ba..e016afa 100644 --- a/states/dkron/install.sls +++ b/states/dkron/install.sls @@ -9,8 +9,8 @@ dkron-archive-extract: - name: {{ dkron.release_dir }}/dkron_{{ dkron.version }} - source: {{ dkron.mirror }}/v{{ dkron.version }}/dkron_{{ dkron.version }}_{{ dkron.os }}_{{ dkron.arch }}.tar.gz - user: {{ dkron.runuser }} - - enforce_toplevel: False - - skip_verify: True + - enforce_toplevel: false + - skip_verify: true - archive_format: tar - if_missing: {{ dkron.release_dir }}/dkron_{{ dkron.version }} diff --git a/states/dkron/service.sls b/states/dkron/service.sls index ec0657c..e5426d6 100644 --- a/states/dkron/service.sls +++ b/states/dkron/service.sls @@ -13,4 +13,4 @@ dkron-service-file: dkron-service: service.running: - name: dkron@{{ dkron.runuser }} - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/docker/service.sls b/states/docker/service.sls index 8c2ffed..2a6888b 100644 --- a/states/docker/service.sls +++ b/states/docker/service.sls @@ -2,4 +2,4 @@ docker-service: service.running: - name: docker - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/dokuwiki/install.sls b/states/dokuwiki/install.sls index d027aac..4d10386 100644 --- a/states/dokuwiki/install.sls +++ b/states/dokuwiki/install.sls @@ -4,7 +4,7 @@ dokuwiki-archive: archive.extracted: - name: {{ dokuwiki.release_dir }} - source: {{ dokuwiki.mirror }}/{{ dokuwiki.version }}.tar.gz - - skip_verify: True + - skip_verify: true - archive_format: tar - user: {{ dokuwiki.user }} - group: {{ dokuwiki.group }} @@ -14,7 +14,7 @@ dokuwiki-install-link: file.symlink: - name: {{ dokuwiki.install_dir }}/dokuwiki - target: {{ dokuwiki.release_dir }}/dokuwiki-{{ dokuwiki.version }} - - force: True + - force: true dokuwiki-savedir: file.directory: diff --git a/states/dovecot/service.sls b/states/dovecot/service.sls index 5c7553a..82ae912 100644 --- a/states/dovecot/service.sls +++ b/states/dovecot/service.sls @@ -2,4 +2,4 @@ dovecot-service: service.running: - name: dovecot - - enable: True + - enable: true diff --git a/states/fuelprices/install.sls b/states/fuelprices/install.sls index f17af1a..b0acefa 100644 --- a/states/fuelprices/install.sls +++ b/states/fuelprices/install.sls @@ -4,8 +4,8 @@ fuelprices-archive-extract: archive.extracted: - name: {{ fuelprices.release_dir }}/fuelprices-{{ fuelprices.version }} - source: {{ fuelprices.mirror }}/{{ fuelprices.version }}/fuelprices-{{ fuelprices.version }}-{{ fuelprices.os }}-{{ fuelprices.arch }}.tar.gz - - skip_verify: True - - enforce_toplevel: False + - skip_verify: true + - enforce_toplevel: false - if_missing: {{ fuelprices.release_dir }}/fuelprices-{{ fuelprices.version }} fuelprices-binary-symlink: diff --git a/states/g2g/install.sls b/states/g2g/install.sls index 1e5ef66..dbb7dce 100644 --- a/states/g2g/install.sls +++ b/states/g2g/install.sls @@ -4,8 +4,8 @@ g2g-archive-extract: archive.extracted: - name: {{ g2g.release_dir }}/g2g-{{ g2g.version }} - source: {{ g2g.mirror }}/{{ g2g.version }}/g2g-{{ g2g.version }}-{{ g2g.os }}-{{ g2g.arch }}.tar.gz - - skip_verify: True - - enforce_toplevel: False + - skip_verify: true + - enforce_toplevel: false - if_missing: {{ g2g.release_dir }}/g2g-{{ g2g.version }} g2g-binary-symlink: diff --git a/states/gitea/config.sls b/states/gitea/config.sls index 74253a5..2509dba 100644 --- a/states/gitea/config.sls +++ b/states/gitea/config.sls @@ -10,6 +10,6 @@ - user: git - group: git - mode: 640 - - makedirs: True + - makedirs: true - require: - git \ No newline at end of file diff --git a/states/gitea/install.sls b/states/gitea/install.sls index dfc5430..6915c2c 100644 --- a/states/gitea/install.sls +++ b/states/gitea/install.sls @@ -5,9 +5,9 @@ git: group.present: - - system: True + - system: true user.present: - - system: True + - system: true - home: /var/lib/gitea - shell: /usr/sbin/nologin - groups: diff --git a/states/gitea/service.sls b/states/gitea/service.sls index ac2d99b..288e1f1 100644 --- a/states/gitea/service.sls +++ b/states/gitea/service.sls @@ -5,8 +5,8 @@ gitea: service.running: - - enable: True - - full_restart: True + - enable: true + - full_restart: true - watch: - file: /var/lib/gitea/gitea - file: /var/lib/gitea/custom/conf/app.ini @@ -17,4 +17,4 @@ gitea: - user: root - group: root - mode: 644 - - makedirs: True \ No newline at end of file + - makedirs: true \ No newline at end of file diff --git a/states/gobackup/install.sls b/states/gobackup/install.sls index 9f07e36..95fd720 100644 --- a/states/gobackup/install.sls +++ b/states/gobackup/install.sls @@ -7,7 +7,7 @@ gobackup-bin: - user: root - group: root - mode: 0755 - - skip_verify: True + - skip_verify: true - if_missing: {{ gobackup.install_dir }}/gobackup gobackup-backups-path: diff --git a/states/golang/install.sls b/states/golang/install.sls index 7e567fa..7eb5905 100644 --- a/states/golang/install.sls +++ b/states/golang/install.sls @@ -4,8 +4,8 @@ golang-archive-extract: archive.extracted: - name: {{ golang.install_dir }}/go{{ golang.version }} - source: {{ golang.mirror }}/go{{ golang.version }}.{{ golang.os }}-{{ golang.arch }}.tar.gz - - skip_verify: True - - enforce_toplevel: False + - skip_verify: true + - enforce_toplevel: false - options: --transform 's/^go\///g' - if_missing: {{ golang.install_dir }}/go{{ golang.version }} @@ -13,6 +13,6 @@ golang-binary-symlink: file.symlink: - name: {{ golang.install_dir }}/go - target: {{ golang.install_dir }}/go{{ golang.version }} - - force: True + - force: true - require: - archive: golang-archive-extract \ No newline at end of file diff --git a/states/influxdb/install.sls b/states/influxdb/install.sls index e854fbe..f76aa29 100644 --- a/states/influxdb/install.sls +++ b/states/influxdb/install.sls @@ -12,8 +12,8 @@ influxdb-user: - name: influxdb - uid: {{ influxdb.user.uid }} - gid: {{ influxdb.group.gid }} - - allow_uid_change: True - - allow_gid_change: True + - allow_uid_change: true + - allow_gid_change: true - home: /var/lib/influxdb - watch_in: - service: influxdb-service @@ -26,10 +26,10 @@ influxdb-archive-extract: archive.extracted: - name: {{ influxdb.release_dir }}/influxdb-{{ influxdb.version }} - source: {{ influxdb.mirror }}/influxdb-{{ influxdb.version }}_{{ influxdb.os }}_{{ influxdb.arch }}.tar.gz - - skip_verify: True + - skip_verify: true - archive_format: tar - options: --strip 4 - - enforce_toplevel: False + - enforce_toplevel: false - if_missing: {{ influxdb.release_dir }}/influxdb-{{ influxdb.version }}/influxd - watch_in: - service: influxdb-service diff --git a/states/influxdb/service.sls b/states/influxdb/service.sls index c44fa5e..a67c34a 100644 --- a/states/influxdb/service.sls +++ b/states/influxdb/service.sls @@ -12,4 +12,4 @@ influxdb-service-file: influxdb-service: service.running: - name: influxdb - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/ipfs/init.sls b/states/ipfs/init.sls index 5344d13..60e9991 100644 --- a/states/ipfs/init.sls +++ b/states/ipfs/init.sls @@ -10,8 +10,8 @@ ipfs-user: - uid: 899 - gid: 899 - home: /var/lib/ipfs - - allow_uid_change: True - - allow_gid_change: True + - allow_uid_change: true + - allow_gid_change: true ipfs-dir: file.directory: @@ -84,6 +84,6 @@ ipfs-service-file: ipfs-service: service.running: - name: ipfs - - enable: True + - enable: true - require: - file: ipfs-dir \ No newline at end of file diff --git a/states/iptables/init.sls b/states/iptables/init.sls index f20b099..6bf338b 100644 --- a/states/iptables/init.sls +++ b/states/iptables/init.sls @@ -91,6 +91,6 @@ ip6tables-reset-config: iptables-service: service.running: - name: iptables - - enable: True + - enable: true - require: - pkg: iptables-pkg \ No newline at end of file diff --git a/states/iptables/iptables.sls b/states/iptables/iptables.sls index 38dd307..5483ce4 100644 --- a/states/iptables/iptables.sls +++ b/states/iptables/iptables.sls @@ -87,6 +87,6 @@ ip6tables-reset-config: iptables-service: service.running: - name: iptables - - enable: True + - enable: true - require: - pkg: iptables-pkg \ No newline at end of file diff --git a/states/java/install.sls b/states/java/install.sls index 2e3310f..795e629 100644 --- a/states/java/install.sls +++ b/states/java/install.sls @@ -14,14 +14,14 @@ java_extract: - source: {{ java.fetch_url }}/jdk-{{ java.version }}_{{ java.os }}-{{ java.arch }}_bin.tar.gz - user: root - group: root - - skip_verify: True + - skip_verify: true - if_missing: {{ java.install_dir }}/jdk-{{ java.version }} java_link: file.symlink: - name: {{ java.install_dir }}/default - target: {{ java.install_dir }}/jdk-{{ java.version }} - - force: True + - force: true - user: root - group: root diff --git a/states/maildb/maildb.py b/states/maildb/maildb.py index e6d617e..6172584 100644 --- a/states/maildb/maildb.py +++ b/states/maildb/maildb.py @@ -14,10 +14,10 @@ def DBConfig(configfile): config.read(configfile) d_dbconfig = { - 'host' : config.get("maildb", "hostname"), - 'user' : config.get("maildb", "username"), - 'passwd' : config.get("maildb", "password"), - 'db' : config.get("maildb", "database") + 'host' : config.get("maildb", "hostname"), + 'user' : config.get("maildb", "username"), + 'passwd' : config.get("maildb", "password"), + 'db' : config.get("maildb", "database") } return d_dbconfig diff --git a/states/mariadb/service.sls b/states/mariadb/service.sls index 1c7f3d6..2ddb8db 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 \ No newline at end of file diff --git a/states/netbox/install.sls b/states/netbox/install.sls index 54f9177..0b99836 100644 --- a/states/netbox/install.sls +++ b/states/netbox/install.sls @@ -9,7 +9,7 @@ netbox-archive-extract: archive.extracted: - name: {{ netbox.release_dir }} - source: {{ netbox.archive_url }}/v{{ netbox.version }}.tar.gz - - skip_verify: True + - skip_verify: true netbox-install-link: file.symlink: diff --git a/states/netbox/service.sls b/states/netbox/service.sls index 4d684dd..6a47c67 100644 --- a/states/netbox/service.sls +++ b/states/netbox/service.sls @@ -11,4 +11,4 @@ netbox-service-file: netbox-service: service.running: - name: netbox - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/nextcloud/install.sls b/states/nextcloud/install.sls index 03cfc2f..09cab9d 100644 --- a/states/nextcloud/install.sls +++ b/states/nextcloud/install.sls @@ -4,9 +4,9 @@ nextcloud-archive: archive.extracted: - name: {{ nextcloud.release_dir }}/nextcloud-{{ nextcloud.version }} - source: {{ nextcloud.mirror }}/nextcloud-{{ nextcloud.version }}.tar.bz2 - - skip_verify: True + - skip_verify: true - archive_format: tar - - enforce_toplevel: False + - enforce_toplevel: false - options: --strip 1 - user: {{ nextcloud.user }} - group: {{ nextcloud.group }} @@ -16,7 +16,7 @@ nextcloud-install-link: file.symlink: - name: {{ nextcloud.install_dir }}/nextcloud - target: {{ nextcloud.release_dir }}/nextcloud-{{ nextcloud.version }} - - force: True + - force: true nextcloud-datadirectory: file.directory: diff --git a/states/nextcloud_desktop/init.sls b/states/nextcloud_desktop/init.sls index 19ee716..7487a47 100644 --- a/states/nextcloud_desktop/init.sls +++ b/states/nextcloud_desktop/init.sls @@ -5,7 +5,7 @@ nextcloud-desktop-appimage: file.managed: - name: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }} - source: {{ nextcloud_desktop.url }}/Nextcloud-{{ nextcloud_desktop.version }}-x86_64.AppImage - - skip_verify: True + - skip_verify: true - user: root - group: root - mode: 755 @@ -15,7 +15,7 @@ nextcloud-desktop-install-link: file.symlink: - name: {{ nextcloud_desktop.dest_path }} - target: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }} - - force: True + - force: true - watch: - file: nextcloud-desktop-appimage diff --git a/states/nftables/init.sls b/states/nftables/init.sls index 030c26c..9c6190a 100644 --- a/states/nftables/init.sls +++ b/states/nftables/init.sls @@ -17,6 +17,6 @@ nftables-main-config: nftables-service: service.running: - name: nftables - - enable: True + - enable: true - require: - pkg: nftables-pkg \ No newline at end of file diff --git a/states/nginx/service.sls b/states/nginx/service.sls index a338524..1397ff5 100644 --- a/states/nginx/service.sls +++ b/states/nginx/service.sls @@ -2,5 +2,5 @@ nginx-service: service.running: - name: nginx - - enable: True - - reload: True \ No newline at end of file + - enable: true + - reload: true \ No newline at end of file diff --git a/states/npf/init.sls b/states/npf/init.sls index 76738fd..499796d 100644 --- a/states/npf/init.sls +++ b/states/npf/init.sls @@ -10,5 +10,5 @@ npf-main-config: npf-service: service.running: - name: npf - - enable: True - - reload: True \ No newline at end of file + - enable: true + - reload: true \ No newline at end of file diff --git a/states/opendkim/service.sls b/states/opendkim/service.sls index aafe7e5..f7af859 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 \ No newline at end of file diff --git a/states/openvpn_client/service.sls b/states/openvpn_client/service.sls index af7fdaf..7a9aeec 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 \ No newline at end of file diff --git a/states/packer/install.sls b/states/packer/install.sls index 0507b78..2b62ea0 100644 --- a/states/packer/install.sls +++ b/states/packer/install.sls @@ -4,5 +4,5 @@ packer-archive-extract: archive.extracted: - 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 + - skip_verify: true + - enforce_toplevel: false \ No newline at end of file diff --git a/states/php/service.sls b/states/php/service.sls index 6073d34..be0bf4b 100644 --- a/states/php/service.sls +++ b/states/php/service.sls @@ -2,5 +2,5 @@ php-fpm-service: service.running: - name: php7.3-fpm - - enable: True - - reload: True \ No newline at end of file + - enable: true + - reload: true \ No newline at end of file diff --git a/states/pkg/bootstrap.sls b/states/pkg/bootstrap.sls index 21d4140..a4b37ab 100644 --- a/states/pkg/bootstrap.sls +++ b/states/pkg/bootstrap.sls @@ -2,7 +2,7 @@ pkg-full-upgrade: pkg.uptodate: - name: pkg-full-upgrade - - refresh: True + - refresh: true pkg-install-apt-transport-https: pkg.latest: diff --git a/states/pkg/install.sls b/states/pkg/install.sls index 9da8980..c534def 100644 --- a/states/pkg/install.sls +++ b/states/pkg/install.sls @@ -7,7 +7,7 @@ pkg-install: {%- for pkg in pkg.aptpkgs %} - {{ pkg }} {%- endfor %} - - refresh: False + - refresh: false - require: - sls: repos {%- endif %} diff --git a/states/postfix/service.sls b/states/postfix/service.sls index 5a02a5b..092c0b1 100644 --- a/states/postfix/service.sls +++ b/states/postfix/service.sls @@ -3,5 +3,5 @@ postfix-service: service.running: - name: postfix - - enable: True - - reload: True \ No newline at end of file + - enable: true + - reload: true \ No newline at end of file diff --git a/states/postgresql/service.sls b/states/postgresql/service.sls index 664c435..689e56b 100644 --- a/states/postgresql/service.sls +++ b/states/postgresql/service.sls @@ -2,4 +2,4 @@ postgresql-service: service.running: - name: postgresql - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/provision/init.sls b/states/provision/init.sls index 8bc90a2..71344d7 100644 --- a/states/provision/init.sls +++ b/states/provision/init.sls @@ -5,14 +5,14 @@ schedule_highstate: - name: schedule_highstate - function: state.highstate - minutes: 30 - - run_on_start: False + - run_on_start: false schedule_saltutil_clear_cache: schedule.present: - name: schedule_saltutil_clear_cache - function: saltutil.clear_cache - hours: 2 - - run_on_start: False + - run_on_start: false schedule_pkg_refresh: schedule.absent: @@ -27,5 +27,5 @@ schedule_pkg_upgrade: grains.present: - name: {{ key }} - value: {% if specs[salt['grains.get']('id')][key] is defined %}{{ specs[salt['grains.get']('id')][key] }}{% else %}{{ value }}{% endif %} - - force: True + - force: true {% endfor %} diff --git a/states/pycharm/init.sls b/states/pycharm/init.sls index 0762b2a..e66d5ce 100644 --- a/states/pycharm/init.sls +++ b/states/pycharm/init.sls @@ -17,7 +17,7 @@ pycharm-link: file.symlink: - name: {{ pycharm.install_dir }}/pycharm - target: {{ pycharm.install_dir }}/pycharm-community-{{ pycharm.version }} - - force: True + - force: true pycharm-shortcut: file.managed: diff --git a/states/qrz/install.sls b/states/qrz/install.sls index 18ed5a6..824568f 100644 --- a/states/qrz/install.sls +++ b/states/qrz/install.sls @@ -4,8 +4,8 @@ qrz-archive-extract: archive.extracted: - name: {{ qrz.release_dir }}/qrz-{{ qrz.version }} - source: {{ qrz.mirror }}/{{ qrz.version }}/qrz-{{ qrz.version }}-{{ qrz.os }}-{{ qrz.arch }}.tar.gz - - skip_verify: True - - enforce_toplevel: False + - skip_verify: true + - enforce_toplevel: false - if_missing: {{ qrz.release_dir }}/qrz-{{ qrz.version }} - watch_in: - service: qrz-service diff --git a/states/qrz/service.sls b/states/qrz/service.sls index 8c93740..e480876 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 \ No newline at end of file diff --git a/states/rclone/install.sls b/states/rclone/install.sls index c5750ed..629f771 100644 --- a/states/rclone/install.sls +++ b/states/rclone/install.sls @@ -5,15 +5,15 @@ rclone-archive-extract: archive.extracted: - name: {{ rclone.release_dir }} - source: {{ rclone.mirror }}/{{ rclone.version }}/rclone-{{ rclone.version }}-{{ rclone.os }}-{{ rclone.arch }}.zip - - skip_verify: True - - enforce_toplevel: False + - skip_verify: true + - enforce_toplevel: false - if_missing: {{ rclone.release_dir }}/rclone rclone-binary-symlink: file.symlink: - name: /usr/local/bin/rclone - target: {{ rclone.release_dir }}/rclone-{{ rclone.version }}-{{ rclone.os }}-{{ rclone.arch }}/rclone - - force: True + - force: true - require: - archive: rclone-archive-extract {%- endif %} \ No newline at end of file diff --git a/states/redis/service.sls b/states/redis/service.sls index 2f7c534..e7e8062 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 \ No newline at end of file diff --git a/states/repos/init.sls b/states/repos/init.sls index c61372b..8cb57e9 100644 --- a/states/repos/init.sls +++ b/states/repos/init.sls @@ -12,7 +12,7 @@ repo-{{ repo['name'] }}: - name: {{ repo['src'] }} - gpgcheck: {{ repo['gpgcheck']|default(1) }} - file: {{ repo['file'] }} - - clean_file: True + - clean_file: true {%- if repo['key_method'] is defined %} {%- if repo['key_method'] == 'file' %} - key_url: {{ repo['key_url'] }} @@ -22,7 +22,7 @@ repo-{{ repo['name'] }}: {%- endif %} {%- endif %} {%- endif %} - - refresh: True + - refresh: true {%- else %} repo-{{ repo['name'] }}: diff --git a/states/rspamd/service.sls b/states/rspamd/service.sls index 765da76..c74248a 100644 --- a/states/rspamd/service.sls +++ b/states/rspamd/service.sls @@ -2,4 +2,4 @@ rspamd-service: service.running: - name: rspamd - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/rsync/service.sls b/states/rsync/service.sls index 65722f6..1847c6c 100644 --- a/states/rsync/service.sls +++ b/states/rsync/service.sls @@ -2,6 +2,6 @@ rsync-service: service.running: - name: rsync - - enable: True + - enable: true - require: - file: rsync-config \ No newline at end of file diff --git a/states/rsyslog/service.sls b/states/rsyslog/service.sls index 88be17b..d1aa255 100644 --- a/states/rsyslog/service.sls +++ b/states/rsyslog/service.sls @@ -2,4 +2,4 @@ rsyslog-service: service.running: - name: rsyslog - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/samba/users.sls b/states/samba/users.sls index af182ac..ce9d366 100644 --- a/states/samba/users.sls +++ b/states/samba/users.sls @@ -12,7 +12,7 @@ samba-user-{{ user.name }}: - name: {{ user.name }} - login: {{ user.name }} - password: "{{ user.password }}" - - password_hashed: False + - password_hashed: false - require: - pkg: samba-pkg {%- endfor %} \ No newline at end of file diff --git a/states/services/init.sls b/states/services/init.sls index d9cfe5b..3b8ab80 100644 --- a/states/services/init.sls +++ b/states/services/init.sls @@ -7,7 +7,7 @@ include: service-{{ service }}: service.running: - name: {{ service }} - - enable: True + - enable: true - require: - pkg: pkg-install {%- endfor %} @@ -18,6 +18,6 @@ service-{{ service }}: service-{{ service }}: service.dead: - name: {{ service }} - - enable: False + - enable: false {%- endfor %} {%- endif %} \ No newline at end of file diff --git a/states/ssh/service.sls b/states/ssh/service.sls index ca17696..402d39f 100644 --- a/states/ssh/service.sls +++ b/states/ssh/service.sls @@ -2,5 +2,5 @@ ssh-sshd-service: service.running: - name: sshd - - enable: True - - reload: True \ No newline at end of file + - enable: true + - reload: true \ No newline at end of file diff --git a/states/sublimetext/init.sls b/states/sublimetext/init.sls index 0240648..40aebe2 100644 --- a/states/sublimetext/init.sls +++ b/states/sublimetext/init.sls @@ -4,7 +4,7 @@ sublime-text-extract-archive: archive.extracted: - name: {{ sublimetext.install_dir }} - source: {{ sublimetext.fetch_url }}/{{ sublimetext.archive_name }} - - skip_verify: True + - skip_verify: true - user: root - group: root - mode: 0755 diff --git a/states/syncthing/config_old.sls b/states/syncthing/config_old.sls index ebb16e5..74a38e9 100644 --- a/states/syncthing/config_old.sls +++ b/states/syncthing/config_old.sls @@ -4,7 +4,7 @@ #syncthing-config-dir: # file.directory: # - name: {{ configdir }} -# - makedirs: True +# - makedirs: true # - watch_in: # - service: syncthing-service diff --git a/states/syncthing/install.sls b/states/syncthing/install.sls index 42a66ec..0203488 100644 --- a/states/syncthing/install.sls +++ b/states/syncthing/install.sls @@ -4,8 +4,8 @@ syncthing-archive-extract: archive.extracted: - name: {{ syncthing.release_dir }} - source: {{ syncthing.mirror }}/v{{ syncthing.version }}/syncthing-{{ syncthing.os }}-{{ syncthing.arch }}-v{{ syncthing.version }}.tar.gz - - enforce_toplevel: False - - skip_verify: True + - enforce_toplevel: false + - skip_verify: true - archive_format: tar - if_missing: {{ syncthing.release_dir }}/syncthing-{{ syncthing.os }}-{{ syncthing.arch }}-v{{ syncthing.version }} - watch_in: diff --git a/states/syncthing/service.sls b/states/syncthing/service.sls index b31c567..2abbf00 100644 --- a/states/syncthing/service.sls +++ b/states/syncthing/service.sls @@ -13,4 +13,4 @@ syncthing-service-file: syncthing-service: service.running: - name: syncthing@{{ syncthing.user }} - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/telegraf/install.sls b/states/telegraf/install.sls index a175804..8e94c1a 100644 --- a/states/telegraf/install.sls +++ b/states/telegraf/install.sls @@ -5,9 +5,9 @@ telegraf-archive-extract: archive.extracted: - name: {{ telegraf.release_dir }}/telegraf-{{ telegraf.version }} - source: {{ telegraf.mirror }}/telegraf-{{ telegraf.version }}_{{ salt['grains.get']('kernel')|lower }}_{{ salt['grains.get']('osarch') }}.tar.gz - - enforce_toplevel: False + - enforce_toplevel: false - options: --transform 's|^\{{ archive_exclude_dir }}|/|g' --exclude '{{ archive_exclude_dir }}/etc' --exclude '{{ archive_exclude_dir }}/usr/lib' --exclude '{{ archive_exclude_dir }}/var' --strip 2 - - skip_verify: True + - skip_verify: true - archive_format: tar - if_missing: {{ telegraf.release_dir }}/telegraf-{{ telegraf.version }}/telegraf - watch_in: diff --git a/states/telegraf/service.sls b/states/telegraf/service.sls index 48ec4bf..e716a2f 100644 --- a/states/telegraf/service.sls +++ b/states/telegraf/service.sls @@ -13,4 +13,4 @@ telegraf-service-file: telegraf-service: service.running: - name: telegraf - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/telegram/install.sls b/states/telegram/install.sls index 0f1fb3a..7e7c1a8 100644 --- a/states/telegram/install.sls +++ b/states/telegram/install.sls @@ -4,24 +4,24 @@ telegram-archive-extract: archive.extracted: - name: {{ telegram.dest_path }}{{ telegram.version }} - source: {{ telegram.mirror }}/v{{ telegram.version }}/tsetup.{{ telegram.version }}.tar.xz - - skip_verify: True + - skip_verify: true - archive_format: tar - - enforce_toplevel: False + - enforce_toplevel: false - options: --transform 's/Telegram/telegram/g' --transform 's/Updater/updater/g' --strip 1 - - keep: True + - keep: true - if_missing: {{ telegram.dest_path }}{{ telegram.version }}/telegram telegram-symlink: file.symlink: - name: {{ telegram.install_dir }}/telegram - target: {{ telegram.dest_path }}{{ telegram.version }} - - force: True + - force: true telegram-bin-symlink: file.symlink: - name: /usr/bin/telegram - target: {{ telegram.dest_path }}{{ telegram.version }}/telegram - - force: True + - force: true telegram-shortcut: file.managed: diff --git a/states/tests/repo.sls b/states/tests/repo.sls index e33ffcd..fe8101c 100644 --- a/states/tests/repo.sls +++ b/states/tests/repo.sls @@ -5,9 +5,9 @@ # - name: deb http://download.bareos.org/bareos/release/17.2/xUbuntu_16.04 / # - gpgcheck: 1 # - file: /etc/apt/sources.list.d/bareos.list - # - clean_file: True + # - clean_file: true # - key_url: http://download.bareos.org/bareos/release/17.2/xUbuntu_16.04/Release.key - # - refresh_db: True + # - refresh_db: true pkg-repo-test-absent: pkgrepo.absent: diff --git a/states/time/service.sls b/states/time/service.sls index 5731159..e537d2d 100644 --- a/states/time/service.sls +++ b/states/time/service.sls @@ -3,4 +3,4 @@ ntp-service: service.running: - name: ntp - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/time/timezone.sls b/states/time/timezone.sls index 96b9dc5..c1f8f4c 100644 --- a/states/time/timezone.sls +++ b/states/time/timezone.sls @@ -3,4 +3,4 @@ time-timezone: timezone.system: - name: {{ time.zone }} - - utc: False \ No newline at end of file + - utc: false \ No newline at end of file diff --git a/states/transmission/config.sls b/states/transmission/config.sls index b6d16ac..7610479 100644 --- a/states/transmission/config.sls +++ b/states/transmission/config.sls @@ -4,7 +4,7 @@ transmission-dl-dir: file.directory: - name: {{ transmission['config']['download-dir'] }} - - makedirs: True + - makedirs: true - user: debian-transmission - group: debian-transmission - mode: 755 diff --git a/states/transmission/service.sls b/states/transmission/service.sls index 41bdef4..da7f805 100644 --- a/states/transmission/service.sls +++ b/states/transmission/service.sls @@ -2,4 +2,4 @@ transmission-service: service.running: - name: transmission-daemon - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/users/users.sls b/states/users/users.sls index ae9ad2f..4d1f6d0 100644 --- a/states/users/users.sls +++ b/states/users/users.sls @@ -18,9 +18,9 @@ user-{{ user.name }}: - shell: {{ user.shell }} - home: {{ user.home }} - password: {{ user.password }} - - hash_password: True + - hash_password: true - gid: {{ user.gid }} - - allow_gid_change: True + - allow_gid_change: true {%- if user.optional_groups is defined %} - optional_groups: {%- for opt_group in user.optional_groups %} diff --git a/states/vim/install.sls b/states/vim/install.sls index fe10a54..3ecea2f 100644 --- a/states/vim/install.sls +++ b/states/vim/install.sls @@ -7,9 +7,9 @@ vim-pkg: vim-vimfiles-directory: file.directory: - name: {{ vim.plugins_dir }} - - makedirs: True + - makedirs: true vim-colors-directory: file.directory: - name: {{ vim.colors_dir }} - - makedirs: True \ No newline at end of file + - makedirs: true \ No newline at end of file diff --git a/states/vim/plugins.sls b/states/vim/plugins.sls index 6372e7b..c573f0a 100644 --- a/states/vim/plugins.sls +++ b/states/vim/plugins.sls @@ -3,7 +3,7 @@ vim-plugin-dirs: file.directory: - name: {{ vim.plugins_dir }} - - makedirs: True + - makedirs: true {%- for key, value in vim.plugins.items() %} {{ value.name }}: diff --git a/states/vim/themes.sls b/states/vim/themes.sls index 9369774..4d8a366 100644 --- a/states/vim/themes.sls +++ b/states/vim/themes.sls @@ -5,7 +5,7 @@ vim-{{ value.name }}-theme: file.managed: - name: {{ vim.colors_dir }}/{{ value.name }}.vim - source: {{ value.url }} - - skip_verify: True + - skip_verify: true - user: root - group: root - mode: 0644 diff --git a/states/vsftpd/init.sls b/states/vsftpd/init.sls index feb2485..df35e75 100644 --- a/states/vsftpd/init.sls +++ b/states/vsftpd/init.sls @@ -13,4 +13,4 @@ vsftpd-config: vsftpd-service: service.running: - name: vsftpd - - enable: True \ No newline at end of file + - enable: true \ No newline at end of file diff --git a/states/weather/install.sls b/states/weather/install.sls index 8956ebd..59cad5c 100644 --- a/states/weather/install.sls +++ b/states/weather/install.sls @@ -4,8 +4,8 @@ weather-archive-extract: archive.extracted: - name: {{ weather.release_dir }}/weather-{{ weather.version }} - source: {{ weather.mirror }}/{{ weather.version }}/weather-{{ weather.version }}-{{ weather.os }}-{{ weather.arch }}.tar.gz - - skip_verify: True - - enforce_toplevel: False + - skip_verify: true + - enforce_toplevel: false - if_missing: {{ weather.release_dir }}/weather-{{ weather.version }} weather-binary-symlink: diff --git a/states/website/install.sls b/states/website/install.sls index 36aa11a..6c82daa 100644 --- a/states/website/install.sls +++ b/states/website/install.sls @@ -4,8 +4,8 @@ website-archive-extract: archive.extracted: - name: {{ website.release_dir }}/website-{{ website.version }} - source: {{ website.mirror }}/{{ website.version }}/website-{{ website.version }}.tar.gz - - skip_verify: True - - enforce_toplevel: False + - skip_verify: true + - enforce_toplevel: false - if_missing: {{ website.release_dir }}/website-{{ website.version }} website-binary-symlink: