Merge pull request #313 from Icinga/fix/309-custom-config-sub-directo…

…ries Add ability to use nested directories for config
Icinga · Dec 5, 2024 · 6e2b632 · 6e2b632
2 parents d9efd5c + b0648ba
commit 6e2b632
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/changelogs/fragments/fix_issue_309.yml b/changelogs/fragments/fix_issue_309.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - "When using :code:`icinga2_custom_config` sub directories within the found :code:`files/` directory can now be used to deploy Icinga 2 configuration. This allows users to freely structure their :code:`files/` directory (nested directories) (#309)."
diff --git a/roles/icinga2/tasks/objects.yml b/roles/icinga2/tasks/objects.yml
@@ -39,7 +39,7 @@
   block:
     - name: construct _icinga2_custom_conf_paths
       set_fact:
-        _icinga2_custom_conf_paths: "{{ _icinga2_custom_conf_paths + [ icinga2_fragments_path + '/' + item.path + '/' + item.order|default('20')|string + '_' + item.name] }}"
+        _icinga2_custom_conf_paths: "{{ _icinga2_custom_conf_paths + [ icinga2_fragments_path + '/' + item.path + '/' + item.order|default('20')|string + '_' + (item.name | replace('/', '_'))] }}"
       loop: "{{ icinga2_custom_config }}"
 
     - name: prepare custom config paths
@@ -57,5 +57,5 @@
         group: root
         mode: 0644
         src: "files/{{ item.name }}"
-        dest: "{{ icinga2_fragments_path }}/{{ item.path }}/{{ item.order|default('20')|string }}_{{ item.name }}"
+        dest: "{{ icinga2_fragments_path }}/{{ item.path }}/{{ item.order|default('20')|string }}_{{ item.name | replace('/', '_') }}"
       loop: "{{ icinga2_custom_config }}"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- "When using :code:`icinga2_custom_config` sub directories within the found :code:`files/` directory can now be used to deploy Icinga 2 configuration. This allows users to freely structure their :code:`files/` directory (nested directories) (#309)."