Commit ab2f7ce8 authored by Adrian Rossouw's avatar Adrian Rossouw

Add disabled template for apache_ssl , was missing before. #958094

parent 2b26e378
<?php if ($this->ssl_enabled && $this->ssl_key) : ?>
<VirtualHost <?php print "{$ip_address}:{$http_ssl_port}"; ?>>
<?php if ($this->site_mail) : ?>
ServerAdmin <?php print $this->site_mail; ?>
<?php endif;?>
DocumentRoot <?php print $this->root; ?>
ServerName <?php print $this->uri; ?>
# Enable SSL handling.
SSLEngine on
SSLCertificateFile <?php print $ssl_cert; ?>
SSLCertificateKeyFile <?php print $ssl_cert_key; ?>
<?php
if (sizeof($this->aliases)) {
print "\n ServerAlias " . implode("\n ServerAlias ", $this->aliases) . "\n";
}
?>
RewriteEngine on
# the ? at the end is to remove any query string in the original url
RewriteRule ^(.*)$ <?php print $this->platform->server->web_disable_url . '/' . $this->uri ?>?
</VirtualHost>
<?php endif; ?>
<?php
include('http/apache/vhost_disabled.tpl.php');
?>
......@@ -104,8 +104,8 @@ class provisionService_http_public extends provisionService_http {
// Redirection urls
$this->server->web_disable_url = $this->server->master_url .'/hosting/disabled';
$this->server->web_maintenance_url = $this->server->master_url .'/hosting/maintenance';
$this->server->web_disable_url = rtrim($this->server->master_url, '/') .'/hosting/disabled';
$this->server->web_maintenance_url = rtrim($this->server->master_url, '/') .'/hosting/maintenance';
if (!is_null($this->application_name)) {
......
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