Merge pull request #213 from ripienaar/207.1

(#207) manage more required directories
choria-io · Dec 29, 2020 · 45db61a · 45db61a
2 parents 67d7fed + d655566
commit 45db61a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -26,7 +26,7 @@
 
   $_config_dir = dirname($choria::server_config_file)
 
-  file{[$_config_dir, "${_config_dir}/policies", "${_config_dir}/plugin.d"]:
+  file{[$_config_dir, "${_config_dir}/policies", "${_config_dir}/policies/rego", "${_config_dir}/plugin.d"]:
     ensure => "directory",
     owner  => $choria::config_user,
     group  => $choria::config_group,

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -32,6 +32,7 @@
           it { is_expected.to contain_file("C:/ProgramData/choria/etc").with_ensure("directory") }
           it { is_expected.to contain_file("C:/ProgramData/choria/etc/machine").with_ensure("directory") }
           it { is_expected.to contain_file("C:/ProgramData/choria/etc/policies").with_ensure("directory") }
+          it { is_expected.to contain_file("C:/ProgramData/choria/etc/policies/rego").with_ensure("directory") }
           it { is_expected.to contain_file("C:/ProgramData/choria/etc/plugin.d").with_ensure("directory") }
           it { is_expected.to contain_file("C:/ProgramData/choria/etc/overrides.json") }
           it { is_expected.to contain_file("C:/ProgramData/choria/etc/server.conf") }
@@ -45,6 +46,7 @@
           it { is_expected.to contain_file("/etc/choria").with_ensure("directory") }
           it { is_expected.to contain_file("/etc/choria/plugin.d").with_ensure("directory") }
           it { is_expected.to contain_file("/etc/choria/policies").with_ensure("directory") }
+          it { is_expected.to contain_file("/etc/choria/policies/rego").with_ensure("directory") }
           it { is_expected.to contain_file("/etc/choria/machine").with_ensure("directory") }
         end
         context "on FreeBSD", if: facts[:os]["name"] == "FreeBSD" do
@@ -53,6 +55,7 @@
           it { is_expected.to contain_file("/usr/local/etc/choria").with_ensure("directory") }
           it { is_expected.to contain_file("/usr/local/etc/choria/plugin.d").with_ensure("directory") }
           it { is_expected.to contain_file("/usr/local/etc/choria/policies").with_ensure("directory") }
+          it { is_expected.to contain_file("/usr/local/etc/choria/policies/rego").with_ensure("directory") }
           it { is_expected.to contain_file("/usr/local/etc/choria/server.conf") }
           it { is_expected.to contain_file("/usr/local/etc/choria/machine").with_ensure("directory") }
         end