lint on states

This commit is contained in:
Paul 2021-08-19 21:15:24 +02:00
parent ecc6da804e
commit d456c0e9eb
213 changed files with 232 additions and 234 deletions

View File

@ -2,4 +2,4 @@
androidstudio:
enabled: true
install_dir: /usr/local/apps
config:
config: {}

View File

@ -2,4 +2,4 @@
arduino:
mirror: https://downloads.arduino.cc
install_dir: /usr/local/apps
release_dir: /usr/local/apps/releases
release_dir: /usr/local/apps/releases

View File

@ -56,4 +56,4 @@ bareos-fd-service:
- enable: true
- require:
- file: bareos-fd-service-file
{%- endif %}
{%- endif %}

View File

@ -18,4 +18,4 @@ bareos-fd-config:
- service: bareos-fd-service
- require:
- file: bareos-fd-bin
- file: bareos-fd-config-dir
- file: bareos-fd-config-dir

View File

@ -5,4 +5,4 @@ bareos:
install_dir: /usr/local/bin
mirror: https://paulbsd-pub.s3.fr-par.scw.cloud/bareos
os: linux
arch: amd64
arch: amd64

View File

@ -2,4 +2,4 @@
{%- if salt['grains.get']('kernel') == 'Linux' %}
include:
- .install
{%- endif %}
{%- endif %}

View File

@ -14,4 +14,4 @@ bareos-fd-bin:
- skip_verify: true
- user: root
- group: root
- mode: 0755
- mode: 0755

View File

@ -1,3 +1,3 @@
---
Linux:
os: "linux"
os: "linux"

View File

@ -18,4 +18,4 @@ armv7l:
arch: "arm"
armhf:
arch: "arm"
arch: "arm"

View File

@ -16,4 +16,4 @@ bareos-fd-service:
- name: bareos-fd
- enable: true
- require:
- file: bareos-fd-service-file
- file: bareos-fd-service-file

View File

@ -5,4 +5,4 @@
default=defaults.borg,
merge=True
)
-%}
-%}

View File

@ -70,4 +70,4 @@ else
info "Backup and/or Prune finished with errors"
fi
exit ${global_exit}
exit ${global_exit}

View File

@ -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

View File

@ -8,4 +8,4 @@ burp-client-config:
- mode: 0644
- template: jinja
- require:
- pkg: burp-pkg
- pkg: burp-pkg

View File

@ -16,4 +16,4 @@ burp-timer:
- user: root
- mode: 0644
- template: jinja
{%- endif %}
{%- endif %}

View File

@ -63,4 +63,4 @@ burp:
exclude_fs: tmpfs
exclude_comp: bz2
exclude_comp: gz
nobackup: .nobackup
nobackup: .nobackup

View File

@ -9,4 +9,4 @@ include:
{%- elif salt['grains.get']('fqdn') in burp.hosts.name %}
- .client.config
- .client.service
{%- endif %}
{%- endif %}

View File

@ -4,4 +4,4 @@ burp-config-dir:
file.directory:
- name: /etc/burp
- user: root
- mode: 0755
- mode: 0755

View File

@ -1,4 +1,4 @@
---
burp-pkg:
pkg.installed:
- name: burp
- name: burp

View File

@ -14,4 +14,4 @@ cds-config-file:
- group: root
- template: jinja
- watch_in:
- service: cds-service
- service: cds-service

View File

@ -4,4 +4,4 @@ cds:
enabled: true
config:
mirror: https://github.com/ovh/cds/releases/download/
version: 0.43.1
version: 0.43.1

View File

@ -3,4 +3,4 @@
include:
- .install
- .config
- .service
- .service

View File

@ -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') }}
- target: /usr/bin/cds-engine-{{ salt['pillar.get']('cds:version') }}

View File

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

View File

@ -1,3 +1,3 @@
---
include:
- .install
- .install

View File

@ -13,4 +13,4 @@ coronafana-binary-symlink:
- name: {{ coronafana.install_dir }}/coronafana
- target: {{ coronafana.release_dir }}/coronafana-{{ coronafana.version }}
- require:
- archive: coronafana-archive-extract
- archive: coronafana-archive-extract

View File

@ -1,3 +1,3 @@
---
Linux:
os: "linux"
os: "linux"

View File

@ -18,4 +18,4 @@ armv7l:
arch: "arm"
armhf:
arch: "arm"
arch: "arm"

View File

@ -8,4 +8,4 @@ dip:
mirror: https://git.paulbsd.com/paulbsd/dip/releases/download
version: 1.0.0
os: linux
arch: amd64
arch: amd64

View File

@ -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

View File

@ -1,3 +1,3 @@
---
Linux:
os: "linux"
os: "linux"

View File

@ -18,4 +18,4 @@ armv7l:
arch: "arm"
armhf:
arch: "arm"
arch: "arm"

View File

@ -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: []

View File

@ -1,3 +1,3 @@
---
Linux:
os: "linux"
os: "linux"

View File

@ -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
storage-driver: overlay2

View File

@ -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

View File

@ -18,4 +18,4 @@
{%- for key, value in config.items() %}
{{ render(key, value) }}
{%- endfor %}
{%- endfor %}

View File

@ -2,4 +2,4 @@
{%- from "dovecot/map.jinja" import dovecot with context %}
dovecot-pkgs:
pkg.installed:
- pkgs: {{ dovecot.pkgs }}
- pkgs: {{ dovecot.pkgs }}

View File

@ -1,4 +1,4 @@
---
drone:
enabled: true
server:
server: {}

View File

@ -1,4 +1,4 @@
---
include:
- docker
- .server
- .server

View File

@ -4,4 +4,4 @@
drone-server:
docker_container.running:
{{ drone.server }}
{%- endif %}
{%- endif %}

View File

@ -1,3 +1,3 @@
---
include:
- .install
- .install

View File

@ -13,4 +13,4 @@ fuelprices-binary-symlink:
- name: {{ fuelprices.install_dir }}/fuelprices
- target: {{ fuelprices.release_dir }}/fuelprices-{{ fuelprices.version }}
- require:
- archive: fuelprices-archive-extract
- archive: fuelprices-archive-extract

View File

@ -1,3 +1,3 @@
---
Linux:
os: "linux"
os: "linux"

View File

@ -18,4 +18,4 @@ armv7l:
arch: "arm"
armhf:
arch: "arm"
arch: "arm"

View File

@ -1,3 +1,3 @@
---
include:
- .install
- .install

View File

@ -13,4 +13,4 @@ g2g-binary-symlink:
- name: {{ g2g.install_dir }}/g2g
- target: {{ g2g.release_dir }}/g2g-{{ g2g.version }}
- require:
- archive: g2g-archive-extract
- archive: g2g-archive-extract

View File

@ -1,3 +1,3 @@
---
Linux:
os: "linux"
os: "linux"

View File

@ -18,4 +18,4 @@ armv7l:
arch: "arm"
armhf:
arch: "arm"
arch: "arm"

View File

@ -1,4 +1,4 @@
---
include:
- .install
- .config
- .config

View File

@ -1,3 +1,3 @@
---
Linux:
os: linux
os: linux

View File

@ -18,4 +18,4 @@ arm64:
# arch: arm
# armhf:
# arch: arm
# arch: arm

View File

@ -1,3 +1,3 @@
---
include:
- .install
- .install

View File

@ -9,4 +9,4 @@ FreeBSD:
os: "freebsd"
NetBSD:
os: "netbsd"
os: "netbsd"

View File

@ -18,4 +18,4 @@ armv7l:
arch: "armv6l"
armhf:
arch: "armv6l"
arch: "armv6l"

View File

@ -13,4 +13,4 @@ gufw-desktop-cfg:
- name: /etc/gufw/Desktop.profile
- user: root
- group: root
- mode: 600
- mode: 600

View File

@ -17,4 +17,4 @@ influxdb-config-file:
- mode: 644
- template: jinja
- watch_in:
- service: influxdb-service
- service: influxdb-service

View File

@ -1,3 +1,3 @@
---
Linux:
os: "linux"
os: "linux"

View File

@ -18,4 +18,4 @@ armv7l:
arch: "arm"
armhf:
arch: "arm"
arch: "arm"

View File

@ -13,4 +13,4 @@ Restart=on-failure
[Install]
WantedBy=multi-user.target
Alias=influxd.service
Alias=influxd.service

View File

@ -2,4 +2,4 @@
include:
- .install
- .config
- .service
- .service

View File

@ -31,4 +31,4 @@ ipfs-init:
- 0
- 1
- watch-in:
- service: ipfs-service
- service: ipfs-service

View File

@ -9,4 +9,4 @@ FreeBSD:
os: "freebsd"
NetBSD:
os: "netbsd"
os: "netbsd"

View File

@ -18,4 +18,4 @@ armv7l:
arch: "armv6l"
armhf:
arch: "armv6l"
arch: "armv6l"

View File

@ -11,4 +11,4 @@ ipfs-service:
- name: ipfs
- enable: true
- require:
- file: ipfs-dir
- file: ipfs-dir

View File

@ -93,4 +93,4 @@ iptables-service:
- name: iptables
- enable: true
- require:
- pkg: iptables-pkg
- pkg: iptables-pkg

View File

@ -89,4 +89,4 @@ iptables-service:
- name: iptables
- enable: true
- require:
- pkg: iptables-pkg
- pkg: iptables-pkg

View File

@ -5,4 +5,4 @@ java:
version: "11.0.5"
install_dir: /usr/java
os: linux
arch: x64
arch: x64

View File

@ -1,3 +1,3 @@
---
include:
- .install
- .install

View File

@ -36,4 +36,4 @@ java_updatealternatives_script:
java_default:
cmd.run:
- name: {{ java.install_dir }}/default/update-alternatives-java.sh
- name: {{ java.install_dir }}/default/update-alternatives-java.sh

View File

@ -1,3 +1,3 @@
---
Linux:
os: linux
os: linux

View File

@ -18,4 +18,4 @@ x86_64:
# arch: arm
# armhf:
# arch: arm
# arch: arm

View File

@ -1,3 +1,3 @@
---
include:
- .install
- .install

View File

@ -1,3 +1,3 @@
---
Linux:
os: "linux"
os: "linux"

View File

@ -11,4 +11,4 @@
)
-%}
{%- set lego = salt['pillar.get']('lego', default=defaults, merge=True) -%}
{%- set lego = salt['pillar.get']('lego', default=defaults, merge=True) -%}

View File

@ -7,4 +7,4 @@
# locale.system:
# - name: {{ salt["pillar.get"]("locale")|default("en_US.UTF-8") }}
# - require:
# - locale: locale_present
# - locale: locale_present

View File

@ -10,4 +10,4 @@ maildb:
hostname: localhost
username: username
password: password
database: maildb
database: maildb

View File

@ -12,4 +12,4 @@ mariadb-config:
- pkg: mariadb-install-pkgs
- pip: mariadb-install-pip-pkgs
- watch_in:
- service: mariadb-service
- service: mariadb-service

View File

@ -6,4 +6,4 @@ mariadb-database-{{ value.name }}:
- name: {{ value.name }}
- connection_user: {{ mariadb.connection_user }}
- connection_pass: {{ mariadb.connection_pass }}
{%- endfor %}
{%- endfor %}

View File

@ -39,4 +39,4 @@ mariadb:
table_open_cache: 400
thread_cache_size: 128
tmp_table_size: 32M
wait_timeout: 600
wait_timeout: 600

View File

@ -4,4 +4,4 @@ include:
- .config
- .service
- .databases
- .users
- .users

View File

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

View File

@ -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"
short_datetime_format: "Y-m-d H:i"

View File

@ -3,4 +3,4 @@ include:
- redis
- .pkgs
- .install
- .service
- .service

View File

@ -69,4 +69,4 @@ netbox-install-static-files:
- pythonpath: {{ netbox.install_dir }}/netbox/netbox
- bin_env: {{ netbox.install_dir }}/netbox
- require:
- virtualenv: netbox-virtualenv
- virtualenv: netbox-virtualenv

View File

@ -5,4 +5,4 @@ netbox_pkg_reqs:
- pkgs:
{%- for pkg in netbox.pkgs %}
- {{ pkg }}
{%- endfor %}
{%- endfor %}

View File

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

View File

@ -3,4 +3,4 @@ netbox:
sites:
- Caen
- Saint-Lo
- Amsterdam
- Amsterdam

View File

@ -28,4 +28,4 @@ netbox.create_device_{{ salt['grains.get']('nodename')|to_camelcase }}:
- role: {{ salt['grains.get']('type') }}
- manufacturer: default
- model: default
{%- endif %}
{%- endif %}

View File

@ -3,4 +3,4 @@ include:
- php
- redis
- .install
- .config
- .config

View File

@ -27,4 +27,4 @@ $CONFIG = array(
{%- for key, value in nextcloud.config.items() %}
"{{ key }}" => {{ mac(value,loop.last) }}
{%- endfor %}
);
);

View File

@ -33,4 +33,4 @@ nextcloud-desktop-icon-entry:
- source: salt://nextcloud_desktop/nextcloud.desktop
- user: root
- group: root
- mode: 644
- mode: 644

View File

@ -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

View File

@ -1,4 +1,4 @@
---
nftables:
enabled: true
networks:
networks: {}

View File

@ -19,4 +19,4 @@ nftables-service:
- name: nftables
- enable: true
- require:
- pkg: nftables-pkg
- pkg: nftables-pkg

View File

@ -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

View File

@ -1,3 +1,3 @@
---
npf:
enabled: true
enabled: true

View File

@ -11,4 +11,4 @@ npf-service:
service.running:
- name: npf
- enable: true
- reload: true
- reload: true

Some files were not shown because too many files have changed in this diff Show More