updated booleans in sls files

This commit is contained in:
Paul 2020-09-12 17:41:35 +02:00
parent 3b912d3c97
commit 4f7e38fb34
79 changed files with 131 additions and 131 deletions

View File

@ -24,7 +24,7 @@ acme-upgrade:
acme-directories-{{ dir }}: acme-directories-{{ dir }}:
file.directory: file.directory:
- name: {{ dir }} - name: {{ dir }}
- makedirs: True - makedirs: true
{%- endfor %} {%- endfor %}
acme-dh-params: acme-dh-params:

View File

@ -7,9 +7,9 @@ androidstudio-archive-extract:
archive.extracted: archive.extracted:
- name: {{ androidstudio.install_dir }} - name: {{ androidstudio.install_dir }}
- source: {{ androidstudio.mirror }}/{{ androidstudio.version }}/android-studio-ide-{{ androidstudio.tag }}-linux.tar.gz - source: {{ androidstudio.mirror }}/{{ androidstudio.version }}/android-studio-ide-{{ androidstudio.tag }}-linux.tar.gz
- skip_verify: True - skip_verify: true
- archive_format: tar - archive_format: tar
- overwrite: True - overwrite: true
androidstudio-shortcut: androidstudio-shortcut:
file.managed: file.managed:

View File

@ -12,7 +12,7 @@ apt-aptitude-install:
# #
# apt-upgrade: # apt-upgrade:
# pkg.uptodate: # pkg.uptodate:
# - refresh: True # - refresh: true
# #
#apt-cacher-ng-proxy: #apt-cacher-ng-proxy:
# file.managed: # file.managed:

View File

@ -5,16 +5,16 @@ arduino-archive-extract:
archive.extracted: archive.extracted:
- name: {{ arduino.install_dir }} - name: {{ arduino.install_dir }}
- source: {{ arduino.mirror }}/arduino-{{ arduino.version }}-{{ arduino.arch }}.tar.xz - source: {{ arduino.mirror }}/arduino-{{ arduino.version }}-{{ arduino.arch }}.tar.xz
- skip_verify: True - skip_verify: true
- archive_format: tar - archive_format: tar
- keep: True - keep: true
- if_missing: {{ arduino.install_dir }}/arduino-{{ arduino.version }} - if_missing: {{ arduino.install_dir }}/arduino-{{ arduino.version }}
arduino-symlink: arduino-symlink:
file.symlink: file.symlink:
- name: {{ arduino.install_dir }}/arduino - name: {{ arduino.install_dir }}/arduino
- target: {{ arduino.install_dir }}/arduino-{{ arduino.version }} - target: {{ arduino.install_dir }}/arduino-{{ arduino.version }}
- force: True - force: true
- onchanges: - onchanges:
- arduino-archive-extract - arduino-archive-extract
@ -22,7 +22,7 @@ arduino-bin-symlink:
file.symlink: file.symlink:
- name: /usr/bin/arduino - name: /usr/bin/arduino
- target: {{ arduino.install_dir }}/arduino-{{ arduino.version }}/arduino - target: {{ arduino.install_dir }}/arduino-{{ arduino.version }}/arduino
- force: True - force: true
- onchanges: - onchanges:
- arduino-archive-extract - arduino-archive-extract

View File

@ -11,7 +11,7 @@ bareos-fd-bin:
file.managed: file.managed:
- name: /usr/sbin/bareos-fd - name: /usr/sbin/bareos-fd
- source: https://paulbsd-pub.s3.fr-par.scw.cloud/bareos/static-bareos-fd-{{ salt['grains.get']('osarch')|lower }} - 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 - user: root
- group: root - group: root
- mode: 0755 - mode: 0755
@ -53,7 +53,7 @@ bareos-fd-config:
bareos-fd-service: bareos-fd-service:
service.running: service.running:
- name: bareos-fd - name: bareos-fd
- enable: True - enable: true
- require: - require:
- file: bareos-fd-service-file - file: bareos-fd-service-file
{%- endif %} {%- endif %}

View File

@ -11,7 +11,7 @@ bareos-fd-bin:
file.managed: file.managed:
- name: /usr/sbin/bareos-fd - name: /usr/sbin/bareos-fd
- source: {{ bareos.mirror }}/static-bareos-fd-{{ bareos.arch }} - source: {{ bareos.mirror }}/static-bareos-fd-{{ bareos.arch }}
- skip_verify: True - skip_verify: true
- user: root - user: root
- group: root - group: root
- mode: 0755 - mode: 0755

View File

@ -15,6 +15,6 @@ bareos-fd-service-file:
bareos-fd-service: bareos-fd-service:
service.running: service.running:
- name: bareos-fd - name: bareos-fd
- enable: True - enable: true
- require: - require:
- file: bareos-fd-service-file - file: bareos-fd-service-file

View File

@ -4,7 +4,7 @@ cds-engine-install:
file.managed: file.managed:
- name: /usr/bin/cds-engine-{{ salt['pillar.get']('cds:engine:version') }} - 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') }} - 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: cds-bin-symlink:
file.symlink: file.symlink:

View File

@ -12,4 +12,4 @@ cds-service-file:
cds-service: cds-service:
service.running: service.running:
- name: cds - name: cds
- enable: True - enable: true

View File

@ -4,8 +4,8 @@ coronafana-archive-extract:
archive.extracted: archive.extracted:
- name: {{ coronafana.release_dir }}/coronafana-{{ coronafana.version }} - name: {{ coronafana.release_dir }}/coronafana-{{ coronafana.version }}
- source: {{ coronafana.mirror }}/{{ coronafana.version }}/coronafana-{{ coronafana.version }}-{{ coronafana.os }}-{{ coronafana.arch }}.tar.gz - source: {{ coronafana.mirror }}/{{ coronafana.version }}/coronafana-{{ coronafana.version }}-{{ coronafana.os }}-{{ coronafana.arch }}.tar.gz
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false
- if_missing: {{ coronafana.release_dir }}/coronafana-{{ coronafana.version }} - if_missing: {{ coronafana.release_dir }}/coronafana-{{ coronafana.version }}
coronafana-binary-symlink: coronafana-binary-symlink:

View File

@ -4,8 +4,8 @@ dip-archive-extract:
archive.extracted: archive.extracted:
- name: {{ dip.release_dir }}/dip-{{ dip.version }} - name: {{ dip.release_dir }}/dip-{{ dip.version }}
- source: {{ dip.mirror }}/{{ dip.version }}/dip-{{ dip.version }}-{{ dip.os }}-{{ dip.arch }}.tar.gz - source: {{ dip.mirror }}/{{ dip.version }}/dip-{{ dip.version }}-{{ dip.os }}-{{ dip.arch }}.tar.gz
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false
- if_missing: {{ dip.release_dir }}/dip-{{ dip.version }} - if_missing: {{ dip.release_dir }}/dip-{{ dip.version }}
- watch_in: - watch_in:
- service: dip-service - service: dip-service

View File

@ -11,4 +11,4 @@ dip-service-file:
dip-service: dip-service:
service.running: service.running:
- name: dip - name: dip
- enable: True - enable: true

View File

@ -9,8 +9,8 @@ dkron-archive-extract:
- name: {{ dkron.release_dir }}/dkron_{{ dkron.version }} - name: {{ dkron.release_dir }}/dkron_{{ dkron.version }}
- source: {{ dkron.mirror }}/v{{ dkron.version }}/dkron_{{ dkron.version }}_{{ dkron.os }}_{{ dkron.arch }}.tar.gz - source: {{ dkron.mirror }}/v{{ dkron.version }}/dkron_{{ dkron.version }}_{{ dkron.os }}_{{ dkron.arch }}.tar.gz
- user: {{ dkron.runuser }} - user: {{ dkron.runuser }}
- enforce_toplevel: False - enforce_toplevel: false
- skip_verify: True - skip_verify: true
- archive_format: tar - archive_format: tar
- if_missing: {{ dkron.release_dir }}/dkron_{{ dkron.version }} - if_missing: {{ dkron.release_dir }}/dkron_{{ dkron.version }}

View File

@ -13,4 +13,4 @@ dkron-service-file:
dkron-service: dkron-service:
service.running: service.running:
- name: dkron@{{ dkron.runuser }} - name: dkron@{{ dkron.runuser }}
- enable: True - enable: true

View File

@ -2,4 +2,4 @@
docker-service: docker-service:
service.running: service.running:
- name: docker - name: docker
- enable: True - enable: true

View File

@ -4,7 +4,7 @@ dokuwiki-archive:
archive.extracted: archive.extracted:
- name: {{ dokuwiki.release_dir }} - name: {{ dokuwiki.release_dir }}
- source: {{ dokuwiki.mirror }}/{{ dokuwiki.version }}.tar.gz - source: {{ dokuwiki.mirror }}/{{ dokuwiki.version }}.tar.gz
- skip_verify: True - skip_verify: true
- archive_format: tar - archive_format: tar
- user: {{ dokuwiki.user }} - user: {{ dokuwiki.user }}
- group: {{ dokuwiki.group }} - group: {{ dokuwiki.group }}
@ -14,7 +14,7 @@ dokuwiki-install-link:
file.symlink: file.symlink:
- name: {{ dokuwiki.install_dir }}/dokuwiki - name: {{ dokuwiki.install_dir }}/dokuwiki
- target: {{ dokuwiki.release_dir }}/dokuwiki-{{ dokuwiki.version }} - target: {{ dokuwiki.release_dir }}/dokuwiki-{{ dokuwiki.version }}
- force: True - force: true
dokuwiki-savedir: dokuwiki-savedir:
file.directory: file.directory:

View File

@ -2,4 +2,4 @@
dovecot-service: dovecot-service:
service.running: service.running:
- name: dovecot - name: dovecot
- enable: True - enable: true

View File

@ -4,8 +4,8 @@ fuelprices-archive-extract:
archive.extracted: archive.extracted:
- name: {{ fuelprices.release_dir }}/fuelprices-{{ fuelprices.version }} - name: {{ fuelprices.release_dir }}/fuelprices-{{ fuelprices.version }}
- source: {{ fuelprices.mirror }}/{{ fuelprices.version }}/fuelprices-{{ fuelprices.version }}-{{ fuelprices.os }}-{{ fuelprices.arch }}.tar.gz - source: {{ fuelprices.mirror }}/{{ fuelprices.version }}/fuelprices-{{ fuelprices.version }}-{{ fuelprices.os }}-{{ fuelprices.arch }}.tar.gz
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false
- if_missing: {{ fuelprices.release_dir }}/fuelprices-{{ fuelprices.version }} - if_missing: {{ fuelprices.release_dir }}/fuelprices-{{ fuelprices.version }}
fuelprices-binary-symlink: fuelprices-binary-symlink:

View File

@ -4,8 +4,8 @@ g2g-archive-extract:
archive.extracted: archive.extracted:
- name: {{ g2g.release_dir }}/g2g-{{ g2g.version }} - name: {{ g2g.release_dir }}/g2g-{{ g2g.version }}
- source: {{ g2g.mirror }}/{{ g2g.version }}/g2g-{{ g2g.version }}-{{ g2g.os }}-{{ g2g.arch }}.tar.gz - source: {{ g2g.mirror }}/{{ g2g.version }}/g2g-{{ g2g.version }}-{{ g2g.os }}-{{ g2g.arch }}.tar.gz
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false
- if_missing: {{ g2g.release_dir }}/g2g-{{ g2g.version }} - if_missing: {{ g2g.release_dir }}/g2g-{{ g2g.version }}
g2g-binary-symlink: g2g-binary-symlink:

View File

@ -10,6 +10,6 @@
- user: git - user: git
- group: git - group: git
- mode: 640 - mode: 640
- makedirs: True - makedirs: true
- require: - require:
- git - git

View File

@ -5,9 +5,9 @@
git: git:
group.present: group.present:
- system: True - system: true
user.present: user.present:
- system: True - system: true
- home: /var/lib/gitea - home: /var/lib/gitea
- shell: /usr/sbin/nologin - shell: /usr/sbin/nologin
- groups: - groups:

View File

@ -5,8 +5,8 @@
gitea: gitea:
service.running: service.running:
- enable: True - enable: true
- full_restart: True - full_restart: true
- watch: - watch:
- file: /var/lib/gitea/gitea - file: /var/lib/gitea/gitea
- file: /var/lib/gitea/custom/conf/app.ini - file: /var/lib/gitea/custom/conf/app.ini
@ -17,4 +17,4 @@ gitea:
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: 644
- makedirs: True - makedirs: true

View File

@ -7,7 +7,7 @@ gobackup-bin:
- user: root - user: root
- group: root - group: root
- mode: 0755 - mode: 0755
- skip_verify: True - skip_verify: true
- if_missing: {{ gobackup.install_dir }}/gobackup - if_missing: {{ gobackup.install_dir }}/gobackup
gobackup-backups-path: gobackup-backups-path:

View File

@ -4,8 +4,8 @@ golang-archive-extract:
archive.extracted: archive.extracted:
- name: {{ golang.install_dir }}/go{{ golang.version }} - name: {{ golang.install_dir }}/go{{ golang.version }}
- source: {{ golang.mirror }}/go{{ golang.version }}.{{ golang.os }}-{{ golang.arch }}.tar.gz - source: {{ golang.mirror }}/go{{ golang.version }}.{{ golang.os }}-{{ golang.arch }}.tar.gz
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false
- options: --transform 's/^go\///g' - options: --transform 's/^go\///g'
- if_missing: {{ golang.install_dir }}/go{{ golang.version }} - if_missing: {{ golang.install_dir }}/go{{ golang.version }}
@ -13,6 +13,6 @@ golang-binary-symlink:
file.symlink: file.symlink:
- name: {{ golang.install_dir }}/go - name: {{ golang.install_dir }}/go
- target: {{ golang.install_dir }}/go{{ golang.version }} - target: {{ golang.install_dir }}/go{{ golang.version }}
- force: True - force: true
- require: - require:
- archive: golang-archive-extract - archive: golang-archive-extract

View File

@ -12,8 +12,8 @@ influxdb-user:
- name: influxdb - name: influxdb
- uid: {{ influxdb.user.uid }} - uid: {{ influxdb.user.uid }}
- gid: {{ influxdb.group.gid }} - gid: {{ influxdb.group.gid }}
- allow_uid_change: True - allow_uid_change: true
- allow_gid_change: True - allow_gid_change: true
- home: /var/lib/influxdb - home: /var/lib/influxdb
- watch_in: - watch_in:
- service: influxdb-service - service: influxdb-service
@ -26,10 +26,10 @@ influxdb-archive-extract:
archive.extracted: archive.extracted:
- name: {{ influxdb.release_dir }}/influxdb-{{ influxdb.version }} - name: {{ influxdb.release_dir }}/influxdb-{{ influxdb.version }}
- source: {{ influxdb.mirror }}/influxdb-{{ influxdb.version }}_{{ influxdb.os }}_{{ influxdb.arch }}.tar.gz - source: {{ influxdb.mirror }}/influxdb-{{ influxdb.version }}_{{ influxdb.os }}_{{ influxdb.arch }}.tar.gz
- skip_verify: True - skip_verify: true
- archive_format: tar - archive_format: tar
- options: --strip 4 - options: --strip 4
- enforce_toplevel: False - enforce_toplevel: false
- if_missing: {{ influxdb.release_dir }}/influxdb-{{ influxdb.version }}/influxd - if_missing: {{ influxdb.release_dir }}/influxdb-{{ influxdb.version }}/influxd
- watch_in: - watch_in:
- service: influxdb-service - service: influxdb-service

View File

@ -12,4 +12,4 @@ influxdb-service-file:
influxdb-service: influxdb-service:
service.running: service.running:
- name: influxdb - name: influxdb
- enable: True - enable: true

View File

@ -10,8 +10,8 @@ ipfs-user:
- uid: 899 - uid: 899
- gid: 899 - gid: 899
- home: /var/lib/ipfs - home: /var/lib/ipfs
- allow_uid_change: True - allow_uid_change: true
- allow_gid_change: True - allow_gid_change: true
ipfs-dir: ipfs-dir:
file.directory: file.directory:
@ -84,6 +84,6 @@ ipfs-service-file:
ipfs-service: ipfs-service:
service.running: service.running:
- name: ipfs - name: ipfs
- enable: True - enable: true
- require: - require:
- file: ipfs-dir - file: ipfs-dir

View File

@ -91,6 +91,6 @@ ip6tables-reset-config:
iptables-service: iptables-service:
service.running: service.running:
- name: iptables - name: iptables
- enable: True - enable: true
- require: - require:
- pkg: iptables-pkg - pkg: iptables-pkg

View File

@ -87,6 +87,6 @@ ip6tables-reset-config:
iptables-service: iptables-service:
service.running: service.running:
- name: iptables - name: iptables
- enable: True - enable: true
- require: - require:
- pkg: iptables-pkg - pkg: iptables-pkg

View File

@ -14,14 +14,14 @@ java_extract:
- source: {{ java.fetch_url }}/jdk-{{ java.version }}_{{ java.os }}-{{ java.arch }}_bin.tar.gz - source: {{ java.fetch_url }}/jdk-{{ java.version }}_{{ java.os }}-{{ java.arch }}_bin.tar.gz
- user: root - user: root
- group: root - group: root
- skip_verify: True - skip_verify: true
- if_missing: {{ java.install_dir }}/jdk-{{ java.version }} - if_missing: {{ java.install_dir }}/jdk-{{ java.version }}
java_link: java_link:
file.symlink: file.symlink:
- name: {{ java.install_dir }}/default - name: {{ java.install_dir }}/default
- target: {{ java.install_dir }}/jdk-{{ java.version }} - target: {{ java.install_dir }}/jdk-{{ java.version }}
- force: True - force: true
- user: root - user: root
- group: root - group: root

View File

@ -2,4 +2,4 @@
mariadb-service: mariadb-service:
service.running: service.running:
- name: mariadb - name: mariadb
- enable: True - enable: true

View File

@ -9,7 +9,7 @@ netbox-archive-extract:
archive.extracted: archive.extracted:
- name: {{ netbox.release_dir }} - name: {{ netbox.release_dir }}
- source: {{ netbox.archive_url }}/v{{ netbox.version }}.tar.gz - source: {{ netbox.archive_url }}/v{{ netbox.version }}.tar.gz
- skip_verify: True - skip_verify: true
netbox-install-link: netbox-install-link:
file.symlink: file.symlink:

View File

@ -11,4 +11,4 @@ netbox-service-file:
netbox-service: netbox-service:
service.running: service.running:
- name: netbox - name: netbox
- enable: True - enable: true

View File

@ -4,9 +4,9 @@ nextcloud-archive:
archive.extracted: archive.extracted:
- name: {{ nextcloud.release_dir }}/nextcloud-{{ nextcloud.version }} - name: {{ nextcloud.release_dir }}/nextcloud-{{ nextcloud.version }}
- source: {{ nextcloud.mirror }}/nextcloud-{{ nextcloud.version }}.tar.bz2 - source: {{ nextcloud.mirror }}/nextcloud-{{ nextcloud.version }}.tar.bz2
- skip_verify: True - skip_verify: true
- archive_format: tar - archive_format: tar
- enforce_toplevel: False - enforce_toplevel: false
- options: --strip 1 - options: --strip 1
- user: {{ nextcloud.user }} - user: {{ nextcloud.user }}
- group: {{ nextcloud.group }} - group: {{ nextcloud.group }}
@ -16,7 +16,7 @@ nextcloud-install-link:
file.symlink: file.symlink:
- name: {{ nextcloud.install_dir }}/nextcloud - name: {{ nextcloud.install_dir }}/nextcloud
- target: {{ nextcloud.release_dir }}/nextcloud-{{ nextcloud.version }} - target: {{ nextcloud.release_dir }}/nextcloud-{{ nextcloud.version }}
- force: True - force: true
nextcloud-datadirectory: nextcloud-datadirectory:
file.directory: file.directory:

View File

@ -5,7 +5,7 @@ nextcloud-desktop-appimage:
file.managed: file.managed:
- name: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }} - name: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }}
- source: {{ nextcloud_desktop.url }}/Nextcloud-{{ nextcloud_desktop.version }}-x86_64.AppImage - source: {{ nextcloud_desktop.url }}/Nextcloud-{{ nextcloud_desktop.version }}-x86_64.AppImage
- skip_verify: True - skip_verify: true
- user: root - user: root
- group: root - group: root
- mode: 755 - mode: 755
@ -15,7 +15,7 @@ nextcloud-desktop-install-link:
file.symlink: file.symlink:
- name: {{ nextcloud_desktop.dest_path }} - name: {{ nextcloud_desktop.dest_path }}
- target: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }} - target: {{ nextcloud_desktop.dest_path }}-{{ nextcloud_desktop.version }}
- force: True - force: true
- watch: - watch:
- file: nextcloud-desktop-appimage - file: nextcloud-desktop-appimage

View File

@ -17,6 +17,6 @@ nftables-main-config:
nftables-service: nftables-service:
service.running: service.running:
- name: nftables - name: nftables
- enable: True - enable: true
- require: - require:
- pkg: nftables-pkg - pkg: nftables-pkg

View File

@ -2,5 +2,5 @@
nginx-service: nginx-service:
service.running: service.running:
- name: nginx - name: nginx
- enable: True - enable: true
- reload: True - reload: true

View File

@ -10,5 +10,5 @@ npf-main-config:
npf-service: npf-service:
service.running: service.running:
- name: npf - name: npf
- enable: True - enable: true
- reload: True - reload: true

View File

@ -3,4 +3,4 @@
opendkim-service: opendkim-service:
service.running: service.running:
- name: opendkim - name: opendkim
- enable: True - enable: true

View File

@ -2,4 +2,4 @@
openvpn-client-service: openvpn-client-service:
service.running: service.running:
- name: openvpn@vpn - name: openvpn@vpn
- enable: True - enable: true

View File

@ -4,5 +4,5 @@ packer-archive-extract:
archive.extracted: archive.extracted:
- name: {{ packer.install_dir }} - name: {{ packer.install_dir }}
- source: {{ packer.mirror }}/{{ packer.version }}/packer_{{ packer.version }}_{{ packer.kernel }}_{{ packer.osarch }}.zip - source: {{ packer.mirror }}/{{ packer.version }}/packer_{{ packer.version }}_{{ packer.kernel }}_{{ packer.osarch }}.zip
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false

View File

@ -2,5 +2,5 @@
php-fpm-service: php-fpm-service:
service.running: service.running:
- name: php7.3-fpm - name: php7.3-fpm
- enable: True - enable: true
- reload: True - reload: true

View File

@ -2,7 +2,7 @@
pkg-full-upgrade: pkg-full-upgrade:
pkg.uptodate: pkg.uptodate:
- name: pkg-full-upgrade - name: pkg-full-upgrade
- refresh: True - refresh: true
pkg-install-apt-transport-https: pkg-install-apt-transport-https:
pkg.latest: pkg.latest:

View File

@ -7,7 +7,7 @@ pkg-install:
{%- for pkg in pkg.aptpkgs %} {%- for pkg in pkg.aptpkgs %}
- {{ pkg }} - {{ pkg }}
{%- endfor %} {%- endfor %}
- refresh: False - refresh: false
- require: - require:
- sls: repos - sls: repos
{%- endif %} {%- endif %}

View File

@ -3,5 +3,5 @@
postfix-service: postfix-service:
service.running: service.running:
- name: postfix - name: postfix
- enable: True - enable: true
- reload: True - reload: true

View File

@ -2,4 +2,4 @@
postgresql-service: postgresql-service:
service.running: service.running:
- name: postgresql - name: postgresql
- enable: True - enable: true

View File

@ -5,14 +5,14 @@ schedule_highstate:
- name: schedule_highstate - name: schedule_highstate
- function: state.highstate - function: state.highstate
- minutes: 30 - minutes: 30
- run_on_start: False - run_on_start: false
schedule_saltutil_clear_cache: schedule_saltutil_clear_cache:
schedule.present: schedule.present:
- name: schedule_saltutil_clear_cache - name: schedule_saltutil_clear_cache
- function: saltutil.clear_cache - function: saltutil.clear_cache
- hours: 2 - hours: 2
- run_on_start: False - run_on_start: false
schedule_pkg_refresh: schedule_pkg_refresh:
schedule.absent: schedule.absent:
@ -27,5 +27,5 @@ schedule_pkg_upgrade:
grains.present: grains.present:
- name: {{ key }} - name: {{ key }}
- value: {% if specs[salt['grains.get']('id')][key] is defined %}{{ specs[salt['grains.get']('id')][key] }}{% else %}{{ value }}{% endif %} - value: {% if specs[salt['grains.get']('id')][key] is defined %}{{ specs[salt['grains.get']('id')][key] }}{% else %}{{ value }}{% endif %}
- force: True - force: true
{% endfor %} {% endfor %}

View File

@ -17,7 +17,7 @@ pycharm-link:
file.symlink: file.symlink:
- name: {{ pycharm.install_dir }}/pycharm - name: {{ pycharm.install_dir }}/pycharm
- target: {{ pycharm.install_dir }}/pycharm-community-{{ pycharm.version }} - target: {{ pycharm.install_dir }}/pycharm-community-{{ pycharm.version }}
- force: True - force: true
pycharm-shortcut: pycharm-shortcut:
file.managed: file.managed:

View File

@ -4,8 +4,8 @@ qrz-archive-extract:
archive.extracted: archive.extracted:
- name: {{ qrz.release_dir }}/qrz-{{ qrz.version }} - name: {{ qrz.release_dir }}/qrz-{{ qrz.version }}
- source: {{ qrz.mirror }}/{{ qrz.version }}/qrz-{{ qrz.version }}-{{ qrz.os }}-{{ qrz.arch }}.tar.gz - source: {{ qrz.mirror }}/{{ qrz.version }}/qrz-{{ qrz.version }}-{{ qrz.os }}-{{ qrz.arch }}.tar.gz
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false
- if_missing: {{ qrz.release_dir }}/qrz-{{ qrz.version }} - if_missing: {{ qrz.release_dir }}/qrz-{{ qrz.version }}
- watch_in: - watch_in:
- service: qrz-service - service: qrz-service

View File

@ -11,4 +11,4 @@ qrz-service-file:
qrz-service: qrz-service:
service.running: service.running:
- name: qrz - name: qrz
- enable: True - enable: true

View File

@ -5,15 +5,15 @@ rclone-archive-extract:
archive.extracted: archive.extracted:
- name: {{ rclone.release_dir }} - name: {{ rclone.release_dir }}
- source: {{ rclone.mirror }}/{{ rclone.version }}/rclone-{{ rclone.version }}-{{ rclone.os }}-{{ rclone.arch }}.zip - source: {{ rclone.mirror }}/{{ rclone.version }}/rclone-{{ rclone.version }}-{{ rclone.os }}-{{ rclone.arch }}.zip
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false
- if_missing: {{ rclone.release_dir }}/rclone - if_missing: {{ rclone.release_dir }}/rclone
rclone-binary-symlink: rclone-binary-symlink:
file.symlink: file.symlink:
- name: /usr/local/bin/rclone - name: /usr/local/bin/rclone
- target: {{ rclone.release_dir }}/rclone-{{ rclone.version }}-{{ rclone.os }}-{{ rclone.arch }}/rclone - target: {{ rclone.release_dir }}/rclone-{{ rclone.version }}-{{ rclone.os }}-{{ rclone.arch }}/rclone
- force: True - force: true
- require: - require:
- archive: rclone-archive-extract - archive: rclone-archive-extract
{%- endif %} {%- endif %}

View File

@ -2,4 +2,4 @@
redis-service: redis-service:
service.running: service.running:
- name: redis - name: redis
- enable: True - enable: true

View File

@ -12,7 +12,7 @@ repo-{{ repo['name'] }}:
- name: {{ repo['src'] }} - name: {{ repo['src'] }}
- gpgcheck: {{ repo['gpgcheck']|default(1) }} - gpgcheck: {{ repo['gpgcheck']|default(1) }}
- file: {{ repo['file'] }} - file: {{ repo['file'] }}
- clean_file: True - clean_file: true
{%- if repo['key_method'] is defined %} {%- if repo['key_method'] is defined %}
{%- if repo['key_method'] == 'file' %} {%- if repo['key_method'] == 'file' %}
- key_url: {{ repo['key_url'] }} - key_url: {{ repo['key_url'] }}
@ -22,7 +22,7 @@ repo-{{ repo['name'] }}:
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
- refresh: True - refresh: true
{%- else %} {%- else %}
repo-{{ repo['name'] }}: repo-{{ repo['name'] }}:

View File

@ -2,4 +2,4 @@
rspamd-service: rspamd-service:
service.running: service.running:
- name: rspamd - name: rspamd
- enable: True - enable: true

View File

@ -2,6 +2,6 @@
rsync-service: rsync-service:
service.running: service.running:
- name: rsync - name: rsync
- enable: True - enable: true
- require: - require:
- file: rsync-config - file: rsync-config

View File

@ -2,4 +2,4 @@
rsyslog-service: rsyslog-service:
service.running: service.running:
- name: rsyslog - name: rsyslog
- enable: True - enable: true

View File

@ -12,7 +12,7 @@ samba-user-{{ user.name }}:
- name: {{ user.name }} - name: {{ user.name }}
- login: {{ user.name }} - login: {{ user.name }}
- password: "{{ user.password }}" - password: "{{ user.password }}"
- password_hashed: False - password_hashed: false
- require: - require:
- pkg: samba-pkg - pkg: samba-pkg
{%- endfor %} {%- endfor %}

View File

@ -7,7 +7,7 @@ include:
service-{{ service }}: service-{{ service }}:
service.running: service.running:
- name: {{ service }} - name: {{ service }}
- enable: True - enable: true
- require: - require:
- pkg: pkg-install - pkg: pkg-install
{%- endfor %} {%- endfor %}
@ -18,6 +18,6 @@ service-{{ service }}:
service-{{ service }}: service-{{ service }}:
service.dead: service.dead:
- name: {{ service }} - name: {{ service }}
- enable: False - enable: false
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}

View File

@ -2,5 +2,5 @@
ssh-sshd-service: ssh-sshd-service:
service.running: service.running:
- name: sshd - name: sshd
- enable: True - enable: true
- reload: True - reload: true

View File

@ -4,7 +4,7 @@ sublime-text-extract-archive:
archive.extracted: archive.extracted:
- name: {{ sublimetext.install_dir }} - name: {{ sublimetext.install_dir }}
- source: {{ sublimetext.fetch_url }}/{{ sublimetext.archive_name }} - source: {{ sublimetext.fetch_url }}/{{ sublimetext.archive_name }}
- skip_verify: True - skip_verify: true
- user: root - user: root
- group: root - group: root
- mode: 0755 - mode: 0755

View File

@ -4,7 +4,7 @@
#syncthing-config-dir: #syncthing-config-dir:
# file.directory: # file.directory:
# - name: {{ configdir }} # - name: {{ configdir }}
# - makedirs: True # - makedirs: true
# - watch_in: # - watch_in:
# - service: syncthing-service # - service: syncthing-service

View File

@ -4,8 +4,8 @@ syncthing-archive-extract:
archive.extracted: archive.extracted:
- name: {{ syncthing.release_dir }} - name: {{ syncthing.release_dir }}
- source: {{ syncthing.mirror }}/v{{ syncthing.version }}/syncthing-{{ syncthing.os }}-{{ syncthing.arch }}-v{{ syncthing.version }}.tar.gz - source: {{ syncthing.mirror }}/v{{ syncthing.version }}/syncthing-{{ syncthing.os }}-{{ syncthing.arch }}-v{{ syncthing.version }}.tar.gz
- enforce_toplevel: False - enforce_toplevel: false
- skip_verify: True - skip_verify: true
- archive_format: tar - archive_format: tar
- if_missing: {{ syncthing.release_dir }}/syncthing-{{ syncthing.os }}-{{ syncthing.arch }}-v{{ syncthing.version }} - if_missing: {{ syncthing.release_dir }}/syncthing-{{ syncthing.os }}-{{ syncthing.arch }}-v{{ syncthing.version }}
- watch_in: - watch_in:

View File

@ -13,4 +13,4 @@ syncthing-service-file:
syncthing-service: syncthing-service:
service.running: service.running:
- name: syncthing@{{ syncthing.user }} - name: syncthing@{{ syncthing.user }}
- enable: True - enable: true

View File

@ -5,9 +5,9 @@ telegraf-archive-extract:
archive.extracted: archive.extracted:
- name: {{ telegraf.release_dir }}/telegraf-{{ telegraf.version }} - name: {{ telegraf.release_dir }}/telegraf-{{ telegraf.version }}
- source: {{ telegraf.mirror }}/telegraf-{{ telegraf.version }}_{{ salt['grains.get']('kernel')|lower }}_{{ salt['grains.get']('osarch') }}.tar.gz - 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 - 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 - archive_format: tar
- if_missing: {{ telegraf.release_dir }}/telegraf-{{ telegraf.version }}/telegraf - if_missing: {{ telegraf.release_dir }}/telegraf-{{ telegraf.version }}/telegraf
- watch_in: - watch_in:

View File

@ -13,4 +13,4 @@ telegraf-service-file:
telegraf-service: telegraf-service:
service.running: service.running:
- name: telegraf - name: telegraf
- enable: True - enable: true

View File

@ -4,24 +4,24 @@ telegram-archive-extract:
archive.extracted: archive.extracted:
- name: {{ telegram.dest_path }}{{ telegram.version }} - name: {{ telegram.dest_path }}{{ telegram.version }}
- source: {{ telegram.mirror }}/v{{ telegram.version }}/tsetup.{{ telegram.version }}.tar.xz - source: {{ telegram.mirror }}/v{{ telegram.version }}/tsetup.{{ telegram.version }}.tar.xz
- skip_verify: True - skip_verify: true
- archive_format: tar - archive_format: tar
- enforce_toplevel: False - enforce_toplevel: false
- options: --transform 's/Telegram/telegram/g' --transform 's/Updater/updater/g' --strip 1 - 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 - if_missing: {{ telegram.dest_path }}{{ telegram.version }}/telegram
telegram-symlink: telegram-symlink:
file.symlink: file.symlink:
- name: {{ telegram.install_dir }}/telegram - name: {{ telegram.install_dir }}/telegram
- target: {{ telegram.dest_path }}{{ telegram.version }} - target: {{ telegram.dest_path }}{{ telegram.version }}
- force: True - force: true
telegram-bin-symlink: telegram-bin-symlink:
file.symlink: file.symlink:
- name: /usr/bin/telegram - name: /usr/bin/telegram
- target: {{ telegram.dest_path }}{{ telegram.version }}/telegram - target: {{ telegram.dest_path }}{{ telegram.version }}/telegram
- force: True - force: true
telegram-shortcut: telegram-shortcut:
file.managed: file.managed:

View File

@ -5,9 +5,9 @@
# - name: deb http://download.bareos.org/bareos/release/17.2/xUbuntu_16.04 / # - name: deb http://download.bareos.org/bareos/release/17.2/xUbuntu_16.04 /
# - gpgcheck: 1 # - gpgcheck: 1
# - file: /etc/apt/sources.list.d/bareos.list # - 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 # - 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: pkg-repo-test-absent:
pkgrepo.absent: pkgrepo.absent:

View File

@ -3,4 +3,4 @@
ntp-service: ntp-service:
service.running: service.running:
- name: ntp - name: ntp
- enable: True - enable: true

View File

@ -3,4 +3,4 @@
time-timezone: time-timezone:
timezone.system: timezone.system:
- name: {{ time.zone }} - name: {{ time.zone }}
- utc: False - utc: false

View File

@ -4,7 +4,7 @@
transmission-dl-dir: transmission-dl-dir:
file.directory: file.directory:
- name: {{ transmission['config']['download-dir'] }} - name: {{ transmission['config']['download-dir'] }}
- makedirs: True - makedirs: true
- user: debian-transmission - user: debian-transmission
- group: debian-transmission - group: debian-transmission
- mode: 755 - mode: 755

View File

@ -2,4 +2,4 @@
transmission-service: transmission-service:
service.running: service.running:
- name: transmission-daemon - name: transmission-daemon
- enable: True - enable: true

View File

@ -18,9 +18,9 @@ user-{{ user.name }}:
- shell: {{ user.shell }} - shell: {{ user.shell }}
- home: {{ user.home }} - home: {{ user.home }}
- password: {{ user.password }} - password: {{ user.password }}
- hash_password: True - hash_password: true
- gid: {{ user.gid }} - gid: {{ user.gid }}
- allow_gid_change: True - allow_gid_change: true
{%- if user.optional_groups is defined %} {%- if user.optional_groups is defined %}
- optional_groups: - optional_groups:
{%- for opt_group in user.optional_groups %} {%- for opt_group in user.optional_groups %}

View File

@ -7,9 +7,9 @@ vim-pkg:
vim-vimfiles-directory: vim-vimfiles-directory:
file.directory: file.directory:
- name: {{ vim.plugins_dir }} - name: {{ vim.plugins_dir }}
- makedirs: True - makedirs: true
vim-colors-directory: vim-colors-directory:
file.directory: file.directory:
- name: {{ vim.colors_dir }} - name: {{ vim.colors_dir }}
- makedirs: True - makedirs: true

View File

@ -3,7 +3,7 @@
vim-plugin-dirs: vim-plugin-dirs:
file.directory: file.directory:
- name: {{ vim.plugins_dir }} - name: {{ vim.plugins_dir }}
- makedirs: True - makedirs: true
{%- for key, value in vim.plugins.items() %} {%- for key, value in vim.plugins.items() %}
{{ value.name }}: {{ value.name }}:

View File

@ -5,7 +5,7 @@ vim-{{ value.name }}-theme:
file.managed: file.managed:
- name: {{ vim.colors_dir }}/{{ value.name }}.vim - name: {{ vim.colors_dir }}/{{ value.name }}.vim
- source: {{ value.url }} - source: {{ value.url }}
- skip_verify: True - skip_verify: true
- user: root - user: root
- group: root - group: root
- mode: 0644 - mode: 0644

View File

@ -13,4 +13,4 @@ vsftpd-config:
vsftpd-service: vsftpd-service:
service.running: service.running:
- name: vsftpd - name: vsftpd
- enable: True - enable: true

View File

@ -4,8 +4,8 @@ weather-archive-extract:
archive.extracted: archive.extracted:
- name: {{ weather.release_dir }}/weather-{{ weather.version }} - name: {{ weather.release_dir }}/weather-{{ weather.version }}
- source: {{ weather.mirror }}/{{ weather.version }}/weather-{{ weather.version }}-{{ weather.os }}-{{ weather.arch }}.tar.gz - source: {{ weather.mirror }}/{{ weather.version }}/weather-{{ weather.version }}-{{ weather.os }}-{{ weather.arch }}.tar.gz
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false
- if_missing: {{ weather.release_dir }}/weather-{{ weather.version }} - if_missing: {{ weather.release_dir }}/weather-{{ weather.version }}
weather-binary-symlink: weather-binary-symlink:

View File

@ -4,8 +4,8 @@ website-archive-extract:
archive.extracted: archive.extracted:
- name: {{ website.release_dir }}/website-{{ website.version }} - name: {{ website.release_dir }}/website-{{ website.version }}
- source: {{ website.mirror }}/{{ website.version }}/website-{{ website.version }}.tar.gz - source: {{ website.mirror }}/{{ website.version }}/website-{{ website.version }}.tar.gz
- skip_verify: True - skip_verify: true
- enforce_toplevel: False - enforce_toplevel: false
- if_missing: {{ website.release_dir }}/website-{{ website.version }} - if_missing: {{ website.release_dir }}/website-{{ website.version }}
website-binary-symlink: website-binary-symlink: