Skip to content
Snippets Groups Projects
Commit 9e112404 authored by Adrian Rossouw's avatar Adrian Rossouw
Browse files

save current state. changing direction and didnt want to lose existing changes.

parent 06668786
No related branches found
No related tags found
No related merge requests found
......@@ -16,6 +16,8 @@
SetEnv db_host <?php print urlencode($db_host); ?>
SetEnv db_port <?php print urlencode($db_port); ?>
<?php if (!$this->redirection && is_array($this->aliases)) :
foreach ($this->aliases as $alias_url) :
if (trim($alias_url)) : ?>
......
......@@ -7,9 +7,26 @@
* The Apache +SSL service implementation.
*/
include_once('../apache/apache_service.inc');
class provisionService_http_apache_ssl extends provisionService_http_apache {
public $ssl_enabled = TRUE;
class create_server_config() {
}
}
class provisionConfig_apache_server_ssl extends provisionConfig_apache_server {
public $template = 'server_ssl.tpl.php';
}
class provisionConfig_apache_site_ssl extends provisionConfig_apache_site {
public $template = 'vhost_ssl.tpl.php';
public $description = 'apache ssl configuration file';
function filename() {
$this->data['apache_site_conf_path'] . '/' . $this->uri . '_ssl';
}
}
<?php foreach ($ip_addresses as $ip) : ?>
NameVirtualHost <?php print $ip . ":" . $http_ssl_port . "\n"; ?>
<?php endforeach; ?>
<IfModule !ssl_module>
LoadModule ssl_module modules/mod_ssl.so
</IfModule>
<?php include_once(dirname(__FILE__) . '/../apache/server.tpl.php'); ?>
<?php
......@@ -11,6 +11,7 @@ class provisionService_http extends provisionService {
public $service = 'http';
protected $has_port = TRUE;
protected $ssl_enabled = FALSE;
function init() {
parent::init();
......@@ -25,12 +26,25 @@ class provisionService_http extends provisionService {
// Redirection urls
$this->server->setProperty('web_disable_url', $this->server->master_url .'/hosting/disabled');
$this->server->setProperty('web_maintenence_url', $this->server->master_url .'/hosting/maintenance');
if ($this->ssl_enabled) {
$this->init_ssl();
}
}
function init_ssl() {
$this->server->setProperty('http_ssl_port', 443);
$this->ssl_config_path = $this->server->aegir_root . '/config/ssl.d';
}
function default_port() {
return 80;
}
function default_ssl_port() {
return 443;
}
static function option_documentation() {
return array(
'--web_group' => 'server with http: OS group for permissions; working default will be attepted',
......@@ -123,4 +137,5 @@ class provisionService_http extends provisionService {
d($this->context)->platform->server,
);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment