Merge pull request #1387 from edx/jarv/move-nginxtra-tasks-to-public-role

adding extra config tasks

playbooks/edx-east/edxapp.yml

@@ -11,6 +11,8 @@
       - cms
       nginx_default_sites:
       - lms
+      nginx_extra_sites: "{{ NGINX_EDXAPP_EXTRA_SITES }}"
+      nginx_extra_configs: "{{ NGINX_EDXAPP_EXTRA_CONFIGS }}"
     - edxapp
     - role: datadog
       when: COMMON_ENABLE_DATADOG

playbooks/roles/nginx/defaults/main.yml

@@ -4,7 +4,10 @@
 # and should be overridden
 nginx_sites: []
 nginx_redirects: {}
-
+nginx_extra_sites: []
+nginx_extra_configs: []
+NGINX_EDXAPP_EXTRA_SITES: []
+NGINX_EDXAPP_EXTRA_CONFIGS: []
 NGINX_ENABLE_SSL: False
 # Set these to real paths on your
 # filesystem, otherwise nginx will

playbooks/roles/nginx/tasks/main.yml

@@ -73,6 +73,30 @@
   notify: reload nginx
   with_items: nginx_sites
 
+- name: Copying nginx extra configs
+  template: >
+    src={{ item }}
+    dest={{ nginx_sites_available_dir }}/{{ item|basename|replace(".j2", "") }}
+    owner=root group={{ common_web_user }} mode=0640
+  notify: reload nginx
+  with_items: nginx_extra_sites
+
+- name: Creating links for nginx extra configs
+  file: >
+    src={{ nginx_sites_available_dir }}/{{ item|basename|replace(".j2", "")  }}
+    dest={{ nginx_sites_enabled_dir }}/{{ item|basename|replace(".j2", "") }}
+    state=link owner=root group=root
+  notify: reload nginx
+  with_items: nginx_extra_sites
+
+- name: Copying custom nginx config
+  template: >
+    src={{ item }}
+    dest={{ nginx_conf_dir }}/{{ item|basename|replace(".j2", "") }}
+    owner=root group={{ common_web_user }} mode=0640
+  notify: reload nginx
+  with_items: nginx_extra_configs
+
 - name: Copying nginx redirect configs for {{ nginx_redirects }}
   template: >
     src={{ nginx_template_dir }}/nginx_redirect.j2