Commit f982f0cd authored by Dimitris Aragiorgis's avatar Dimitris Aragiorgis Committed by Stratos Psomadakis

deploy: Use domain in ServerName

..otherwise apache complains with:

"RSA server certificate CommonName (CN) `synnefo.live' does NOT match server name!?"
Signed-off-by: default avatarDimitris Aragiorgis <dimitris.aragiorgis@gmail.com>
parent ffc77695
<VirtualHost *:80>
ServerName %HOST%
ServerName %DOMAIN%
RewriteEngine On
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
......
<IfModule mod_ssl.c>
<VirtualHost _default_:443>
ServerName %HOST%
ServerName %DOMAIN%
Alias /static "/usr/share/synnefo/static"
......
# Copyright (C) 2010-2015 GRNET S.A.
# Copyright (C) 2010-2015 GRNET S.A. and individual contributors
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -947,7 +947,7 @@ class Apache(base.Component):
]
def _configure(self):
r1 = {"HOST": self.node.fqdn}
r1 = {"domain": self.node.domain}
return [
("/etc/apache2/sites-available/synnefo", r1, {}),
("/etc/apache2/sites-available/synnefo-ssl", r1, {}),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment