dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert localhost to 127.0.0.1 before determining the host_type.

This commit is contained in:
markjcrane 2015-12-06 12:43:18 -07:00
parent 16abb2849f
commit 622efef416
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/install/resources/classes/install_switch.php
View File

@ -381,13 +381,13 @@ include "root.php";
} }
elseif ($this->global_settings->db_type() == "pgsql") { elseif ($this->global_settings->db_type() == "pgsql") {
$db_host = $this->global_settings->db_host(); $db_host = $this->global_settings->db_host();
if($db_host == 'localhost') { $db_host = '127.0.0.1'; } // lua cannot resolve localhost
if (filter_var($db_host, FILTER_VALIDATE_IP)) { if (filter_var($db_host, FILTER_VALIDATE_IP)) {
$host_type = "hostaddr"; $host_type = "hostaddr";
} }
else { else {
$host_type = "host"; $host_type = "host";
} }
if($db_host == 'localhost') { $db_host = '127.0.0.1'; } // lua cannot resolve localhost
$tmp .= " database[\"system\"] = \"pgsql://".$host_type."=".$db_host." port=".$this->global_settings->db_port()." dbname=".$this->global_settings->db_name()." user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='".$this->global_settings->db_name()."'\";\n"; $tmp .= " database[\"system\"] = \"pgsql://".$host_type."=".$db_host." port=".$this->global_settings->db_port()." dbname=".$this->global_settings->db_name()." user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='".$this->global_settings->db_name()."'\";\n";
$tmp .= " database[\"switch\"] = \"pgsql://".$host_type."=".$db_host." port=".$this->global_settings->db_port()." dbname=freeswitch user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='freeswitch'\";\n"; $tmp .= " database[\"switch\"] = \"pgsql://".$host_type."=".$db_host." port=".$this->global_settings->db_port()." dbname=freeswitch user=".$this->global_settings->db_username()." password=".$this->global_settings->db_password()." options='' application_name='freeswitch'\";\n";
} }