From d834754054b94923588b2350926497a669c0ad78 Mon Sep 17 00:00:00 2001 From: Mark Heiges Date: Wed, 23 Dec 2015 13:03:32 -0500 Subject: [PATCH] allow for special production nginx configuration --- roles/easyredmine/tasks/nginx.yml | 2 +- roles/easyredmine/templates/nginx.conf.j2 | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/roles/easyredmine/tasks/nginx.yml b/roles/easyredmine/tasks/nginx.yml index 54a3d3c..0f4cc17 100644 --- a/roles/easyredmine/tasks/nginx.yml +++ b/roles/easyredmine/tasks/nginx.yml @@ -21,7 +21,7 @@ - nginx - passenger -- template: dest='/etc/nginx/conf.d/{{ ansible_fqdn }}.conf' +- template: dest='/etc/nginx/conf.d/easyredmine.conf' src=nginx.conf.j2 sudo: yes notify: restart nginx diff --git a/roles/easyredmine/templates/nginx.conf.j2 b/roles/easyredmine/templates/nginx.conf.j2 index 5ced327..cc2b020 100644 --- a/roles/easyredmine/templates/nginx.conf.j2 +++ b/roles/easyredmine/templates/nginx.conf.j2 @@ -1,12 +1,20 @@ server { listen 80; + {% if is_production_vm %} + server_name redmine.apidb.org; + {% else %} server_name {{ ansible_fqdn }}; + {% endif %} return 301 https://$host$request_uri; } server { listen 443; + {% if is_production_vm %} + server_name redmine.apidb.org; + {% else %} server_name {{ ansible_fqdn }}; + {% endif %} ssl on; ssl_certificate /etc/pki/tls/certs/{{ ansible_fqdn }}.pem; ssl_certificate_key /etc/pki/tls/certs/{{ ansible_fqdn }}.pem;