Merge branch 'tphummel-fix-nginx-root'

mattfinlayson · Mar 3, 2016 · 81c6a5a · 81c6a5a
2 parents 8ba6448 + 1013d91
commit 81c6a5a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/tasks/install-ui.yml b/tasks/install-ui.yml
@@ -71,14 +71,3 @@
 - name: allow nginx to connect to consul (selinux)
   seboolean: name=httpd_can_network_connect state=yes persistent=yes
   when: consul_is_ui and consul_install_nginx_config and ansible_selinux.status == "enabled"  
-
-- name: create nginx home
-  file: >
-    state=directory
-    path=/var/www/consul/htdocs
-    owner=root
-    group=root
-    mode=0755
-  notify:
-    - restart nginx
-  when: consul_install_nginx_config and consul_enable_nginx_config
diff --git a/templates/consul-nginx.conf.j2 b/templates/consul-nginx.conf.j2
@@ -1,6 +1,6 @@
 server {
   server_name {{ consul_ui_server_name }};
-  root /var/www/consul/htdocs;
+  root {{ consul_ui_dir }};
 
   # --- listen ----------------------------------------------------------------
 

diff --git a/test/templates/consul-nginx.conf.j2 b/test/templates/consul-nginx.conf.j2
@@ -1,6 +1,6 @@
 server {
   server_name {{ consul_ui_server_name }};
-  root /var/www/consul/htdocs;
+  root {{ consul_ui_dir }};
 
   # --- listen ----------------------------------------------------------------
 
@@ -18,7 +18,7 @@ server {
 
 
   location / {
-      proxy_pass http://$server_addr:{{ consul_port_http }};
+      proxy_pass http://{{ consul_client_address }}:{{ consul_port_http }};
       {%- if consul_ui_require_auth -%}
       auth_basic "Restricted";
       auth_basic_user_file {{ consul_ui_auth_user_file }};