Merge pull request #2611 from codeenigma/Updating-wordpress-vhost-template-PR-2.x

Updating-wordpress-vhost-template-PR-2.x

Author: matej5

roles/debian/nginx/templates/vhosts.j2

@@ -8,12 +8,14 @@ upstream {{ upstream.name }} {
 }
 {% endfor %}
 
+{% set primary_domain = domain.server_name.split(' ')[0] %}
+
 {% for server in domain.servers %}
 server {
     listen {{ server.port }}{% if domain.is_default is defined and domain.is_default %} default_server{% endif %}{% if server.ssl %} ssl{% endif %};
     server_name {{ domain.server_name }};
 {% if server.https_redirect is defined and server.https_redirect %}
-    rewrite ^ https://{{ domain.server_name }}$request_uri? permanent;
+    rewrite ^ https://{{ primary_domain }}$request_uri? permanent;
 {% endif %}
 {% if server.custom_directives is defined %}
 {% for directive in server.custom_directives %}