fix: change rendering of domains.txt to template

24367dfa · Nov 14, 2023 · a08304d · a08304d
1 parent 791b72a
commit a08304d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/tasks/domains.yml b/tasks/domains.yml
@@ -1,12 +1,12 @@
 ---
 - name: Ensure domain directories are present.
-  file:
+  ansible.builtin.file:
     name: "{{ dehydrated_certs_dir }}/{{ item.name }}"
     state: directory
   with_items: "{{ dehydrated_domains }}"
 
 - name: Render hook script templates.
-  template:
+  ansible.builtin.template:
     src: hook.sh.j2
     dest: "{{ dehydrated_certs_dir }}/{{ item.name }}/hook.sh"
     mode: '755'
@@ -21,8 +21,7 @@
   with_items: "{{ dehydrated_domains }}"
 
 - name: Ensure Domains are in domains.txt
-  lineinfile:
-    path: "{{ dehydrated_config_dir }}/domains.txt"
-    line: "{{ item.name }}{% if 'alternate_names' in item %}{% for an in item.alternate_names %} {{ an|default(omit) }}{% endfor %}{% endif %}"
-  with_items: "{{ dehydrated_domains }}"
+  ansible.builtin.template:
+    src: domains.txt.j2
+    dest: "{{ dehydrated_config_dir }}/domains.txt"
   notify: dehydrated run
diff --git a/templates/domains.txt.j2 b/templates/domains.txt.j2
@@ -0,0 +1,2 @@
+{% for domain in dehydrated_domains %}{{ domain.name }}{% if 'alternate_names' in domain %}{% for an in domain.alternate_names %} {{ an|default(omit) }}{% endfor %}{% endif %}
+{% endfor %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		{% for domain in dehydrated_domains %}{{ domain.name }}{% if 'alternate_names' in domain %}{% for an in domain.alternate_names %} {{ an\|default(omit) }}{% endfor %}{% endif %}
		{% endfor %}