updated playbooks with redirects for primary hostname

Author: mrhanlon

playbooks/group_vars/all

@@ -1,2 +1 @@
-server_hostname: mirrors.cyverse.org
-selinux_enabled: false
+selinux_enabled: false

playbooks/group_vars/edge

@@ -1,4 +1,6 @@
-dc_version: DE/angular
+primary_hostname: datacommons-edge.cyverse.org
+
+dc_version: edge
 irods_host: data.iplantcollaborative.org
 irods_port: 1247
 irods_zone: iplant
@@ -8,5 +10,4 @@ irods_password:
 
 terrain_api_host: https://everdene.iplantcollaborative.org
 terrain_api_key_path: /etc/ssl/terrain_api/terrain_api_key.pem
-
-anon_files_api_host: https://de.iplantcollaborative.org/anon-files
+anon_files_api_host: https://de.iplantcollaborative.org/anon-files

playbooks/group_vars/prod

@@ -1,7 +1,14 @@
-dc_version: v1.0.2
+primary_hostname: datacommons.cyverse.org
+
+dc_version: v2.0.0
 irods_host: data.iplantcollaborative.org
 irods_port: 1247
 irods_zone: iplant
 irods_path: /iplant/home/shared
 irods_user: anonymous
 irods_password:
+
+terrain_api_host: https://everdene.iplantcollaborative.org
+terrain_api_key_path: /etc/ssl/terrain_api/terrain_api_key.pem
+anon_files_api_host: https://de.iplantcollaborative.org/anon-files
+

playbooks/group_vars/qa

@@ -1,4 +1,6 @@
-dc_version: DE/angular 
+primary_hostname: datacommons-qa.cyverse.org
+
+dc_version: master
 irods_host: qairods.iplantc.org
 irods_port: 1247
 irods_zone: iplant

playbooks/hosts

@@ -3,7 +3,6 @@ ringo.iplantc.org
 
 [qa]
 marybell.iplantc.org
-129.114.6.147 ansible_user=rodeo selinux_enabled=true
 
 [edge]
-rodney.iplantc.org
+rodney.iplantc.org

playbooks/roles/nginx/templates/default.conf.j2

@@ -5,7 +5,11 @@ upstream django {
 server {
     listen 80 default_server;
 
-    server_name {{ server_hostname }};
+    server_name {{ primary_hostname }};
+
+    if ($host != "{{ primary_hostname }}") {
+        rewrite ^(.*)$ https://{{ primary_hostname }}$1;
+    }
 
     charset utf-8;