diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 1b0c06590..5495f230b 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -81,15 +81,6 @@ mode: 0644 when: moodle_enabled | bool -- name: Install nginx's config file from template, if moodle_enabled - template: - src: moodle-nginx.conf.j2 - dest: "/etc/nginx/conf.d/moodle-nginx.conf" - owner: root - group: root - mode: 0644 - when: moodle_enabled | bool - - name: Create symlink 022-moodle.conf from sites-enabled to sites-available, if moodle_enabled (debuntu) file: src: /etc/apache2/sites-available/022-moodle.conf diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index bddf2f3b7..298e108e0 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -59,6 +59,15 @@ - { src: 'ports.conf' , dest: '/etc/{{ apache_service }}/' , mode: '0644' } when: is_debuntu | bool and nginx_enabled | bool +- name: Install nginx's config file from template, if moodle_enabled + template: + src: moodle-nginx.conf.j2 + dest: "/etc/nginx/conf.d/moodle-nginx.conf" + owner: root + group: root + mode: 0644 + when: moodle_enabled | bool + - name: Install /etc/nginx/conf.d/elgg-nginx.conf from template template: src: elgg-nginx.conf diff --git a/roles/moodle/templates/moodle-nginx.conf.j2 b/roles/nginx/templates/moodle-nginx.conf.j2 similarity index 100% rename from roles/moodle/templates/moodle-nginx.conf.j2 rename to roles/nginx/templates/moodle-nginx.conf.j2