Commit 2edd434b authored by mig5's avatar mig5 Committed by mig5

set the site_port in the filename function when creating the site config...

set the site_port in the filename function when creating the site config rather than in the process call which is called afterwards, otherwise we get two aegir vhosts, one with _0 suffix
parent 571f04e7
......@@ -119,14 +119,14 @@ class provisionConfig_apache_site extends provisionConfig_apache {
public $description = 'apache site configuration file';
function filename() {
if (!$this->data['site_port'] || $this->data['site_port'] < 1 || $this->data['site_port'] > 66535) {
$this->data['site_port'] = 80;
}
return $this->data['vhost_path'] . '/' . $this->data['site_url'] . '_' . $this->data['site_port'];
}
function process() {
if (!$this->data['site_port'] || $this->data['site_port'] < 1 || $this->data['site_port'] > 66535) {
$this->data['site_port'] = 80;
}
if ($this->data['aliases'] && !is_array($this->data['aliases'])) {
$this->data['aliases'] = explode(",", $this->data['aliases']);
}
......
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