Fixed template paths

2022-04-10 17:18:27 -04:00 · 2022-04-10 17:18:27 -04:00 · c45247efef
commit c45247efef
parent 74b31073e4
2 changed files with 8 additions and 0 deletions
--- a/tasks/apache2_template.yaml
+++ b/tasks/apache2_template.yaml
@ -1,7 +1,11 @@
 ---
 - name: Write directory-based nextcloud.conf file
  ansible.builtin.template:
+<<<<<<< HEAD
    src: dhcpd.conf.j2
+=======
+    src: apache2_directory_nextcloud.conf.j2
+>>>>>>> 46b6f98 (Fixed template paths)
    dest: "{{ nextcloud_apache2_config_path }}"
    mode: '0644'
  become: true
--- a/tasks/nginx_template.yaml
+++ b/tasks/nginx_template.yaml
@ -1,7 +1,11 @@
 ---
 - name: Write nginx.conf file
  ansible.builtin.template:
+<<<<<<< HEAD
    src: nginx.conf
+=======
+    src: nginx.conf.j2
+>>>>>>> 46b6f98 (Fixed template paths)
    dest: "{{ nextcloud_nginx_config_path }}"
    mode: '0644'
  become: true