Merge pull request #3804 from open-craft/jill/jenkins-nginx

Install jenkins nginx config to nginx_sites_available_dir

playbooks/analytics-jenkins.yml

@@ -5,3 +5,4 @@
   become: True
   roles:
   - jenkins_analytics
+  - nginx

playbooks/roles/jenkins_master/tasks/main.yml

@@ -249,18 +249,18 @@
     - install:base
     - install:plugins
 
-- name: Setup nginix vhost
+- name: Setup nginx vhost
   template:
     src: "etc/nginx/sites-available/jenkins.j2"
-    dest: "/etc/nginx/sites-available/jenkins"
+    dest: "{{ nginx_sites_available_dir }}/jenkins"
   tags:
     - install
     - install:vhosts
 
 - name: Enable jenkins vhost
   file:
-    src: "/etc/nginx/sites-available/jenkins"
-    dest: "/etc/nginx/sites-enabled/jenkins"
+    src: "{{ nginx_sites_available_dir }}/jenkins"
+    dest: "{{ nginx_sites_enabled_dir }}/jenkins"
     state: link
   tags:
     - install