feat(check_cmd): run in config directory

2021-04-19 00:31:26 +02:00 · 2021-04-19 00:31:26 +02:00 · 6718b2a861
commit 6718b2a861
parent bbc1a0e5b5
24 changed files with 24 additions and 0 deletions
--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/arch-base-latest.yaml
+++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/centos-6.yaml
+++ b/test/integration/default/files/_mapdata/centos-6.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/fedora-33.yaml
+++ b/test/integration/default/files/_mapdata/fedora-33.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@ -7,6 +7,7 @@ values:
  added_in_pillar: pillar_value
  arch: amd64
  config: /etc/unbound/unbound.conf
+  config_dir: /etc/unbound
  lookup:
    added_in_lookup: lookup_value
    master: template-master
--- a/unbound/config/file.sls
+++ b/unbound/config/file.sls
@ -23,6 +23,7 @@ unbound-config-file-file-managed:
    - makedirs: True
    - template: jinja
    - check_cmd: unbound-checkconf
+    - tmp_dir: {{ unbound.config_dir }}
    - require:
      - sls: {{ sls_package_install }}
    - context:
--- a/unbound/parameters/defaults.yaml
+++ b/unbound/parameters/defaults.yaml
@ -8,6 +8,7 @@ values:
    name: unbound
  rootgroup: root
  config: '/etc/unbound/unbound.conf'
+  config_dir: '/etc/unbound'
  service:
    name: unbound
  # Just here for testing
--- a/unbound/parameters/os_family/FreeBSD.yaml
+++ b/unbound/parameters/os_family/FreeBSD.yaml
@ -14,4 +14,5 @@
 values:
  rootgroup: wheel
  config: '/usr/local/etc/unbound/unbound.conf'
+  config_dir: '/usr/local/etc/unbound'
 ...
--- a/unbound/parameters/os_family/RedHat.yaml
+++ b/unbound/parameters/os_family/RedHat.yaml
@ -13,4 +13,5 @@
 ---
 values:
  config: /etc/unbound.conf
+  config_dir: /etc
 ...