feat(config): remove interfering users.conf

saltstack-formulas · Mar 10, 2021 · 66ba863 · 66ba863
1 parent ece26a3
commit 66ba863
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/icinga2/config.sls b/icinga2/config.sls
@@ -167,6 +167,9 @@ include:
 
 ### Begin user configuration
 {%-   if conf.users is defined %}
+{{ icinga2.confd_dir }}/users.conf:
+  file.absent: []
+
 {{ icinga2.confd_dir }}/users:
   file.directory:
     - require:

diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb
@@ -128,6 +128,14 @@
   end
 end
 
+control 'icinga2 `conf.d/users.conf` configuration' do
+  title 'should not exist'
+
+  describe file('/etc/icinga2/conf.d/users.conf') do
+    it { should_not exist }
+  end
+end
+
 control 'icinga2 `conf.d/users/alice.conf` configuration' do
   title 'should match desired lines'