Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

issue #725, #760 - change to defaults and webmail config not use port…

… 443 (thanks Rene and Walter); also use is_master instead is_this_master() for disable fix-chownchmod on 'webserver config'
  • Loading branch information...
commit f5c986da22f16a388464edfc9279777bfd6f459b 1 parent a0befdd
mustafaramadhan authored
19 kloxo/httpdocs/lib/domain/web/driver/web__apachelib.php
View
@@ -92,7 +92,8 @@ function updateMainConfFile()
$virtual_file = "/home/apache/conf/defaults/stats.conf";
$init_file = "/home/apache/conf/defaults/init.conf";
- $vdomlist = $this->main->__var_vdomain_list;
+ $vdomlist = $this->main->__var_vdomain_list;
+/*
$iplist = $this->main->__var_ipaddress;
$fdata = null;
@@ -103,6 +104,16 @@ function updateMainConfFile()
$fdata .= "NameVirtualHost {$ip}:443\n\n";
}
}
+*/
+ $iplist = os_get_allips();
+
+ $fdata = null;
+ foreach($iplist as $key => $ip){
+ if ($ip) {
+ $fdata .= "NameVirtualHost {$ip}:80\n";
+ $fdata .= "NameVirtualHost {$ip}:443\n\n";
+ }
+ }
lfile_put_contents($init_file, $fdata);
@@ -684,7 +695,8 @@ static function createCpConfig()
global $gbl, $sgbl, $login, $ghtml;
$vstring = self::staticcreateVirtualHostiplist('80');
- $sstring = self::staticcreateVirtualHostiplist('443');
+ // issue #725, #760 - disable for port 443
+// $sstring = self::staticcreateVirtualHostiplist('443');
$list = array("default" => "_default.conf", "cp" => "cp_config.conf", "disable" => "disable.conf");
@@ -1586,7 +1598,8 @@ static function createWebmailConfig()
$webdata = null;
$webdata .= "<VirtualHost \\\n";
$webdata .= self::staticcreateVirtualHostiplist("80");
- $webdata .= self::staticcreateVirtualHostiplist("443");
+ // issue #725, #760 - disable for port 443
+// $webdata .= self::staticcreateVirtualHostiplist("443");
$webdata .= "\t\t>\n\n";
$webdata .= "\tServerName webmail\n";
$webdata .= "\tServerAlias webmail.*\n\n";
4 kloxo/httpdocs/lib/serverweblib.php
View
@@ -34,7 +34,7 @@ function updateform($subaction, $param)
// return $vlist;
$vlist['mysql_convert'] = array('s', array('--- none ---', 'to-myisam', 'to-innodb'));
$this->setDefaultValue('mysql_convert', '--- none ---');
- if ($sgbl->is_this_master()) {
+ if ($gbl->is_master) {
$vlist['fix_chownchmod'] = array('s', array('--- none ---', 'fix-ownership', 'fix-permissions', 'fix-ALL'));
$this->setDefaultValue('fix_chownchmod', '--- none ---');
}
@@ -49,7 +49,7 @@ function updateform($subaction, $param)
$this->setDefaultValue('apache_optimize', '--- none ---');
$vlist['mysql_convert'] = array('s', array('--- none ---', 'to-myisam', 'to-innodb'));
$this->setDefaultValue('mysql_convert', '--- none ---');
- if ($sgbl->is_this_master()) {
+ if ($gbl->is_master) {
$vlist['fix_chownchmod'] = array('s', array('--- none ---', 'fix-ownership', 'fix-permissions', 'fix-ALL'));
$this->setDefaultValue('fix_chownchmod', '--- none ---');
}
Please sign in to comment.
Something went wrong with that request. Please try again.