From 14a3ff4e9a6bb838726dea4b53987e56ce2b6088 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 25 Jul 2020 09:36:44 -0600 Subject: [PATCH] pgsql host --- app/scripts/resources/classes/scripts.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/scripts/resources/classes/scripts.php b/app/scripts/resources/classes/scripts.php index 69c682c681..b2ac4bb09b 100644 --- a/app/scripts/resources/classes/scripts.php +++ b/app/scripts/resources/classes/scripts.php @@ -238,13 +238,14 @@ if (!class_exists('scripts')) { } elseif ($this->db_type == "pgsql") { if ($this->db_host == "localhost") { $this->db_host = "127.0.0.1"; } + $host = filter_var($this->db_host, FILTER_VALIDATE_IP) ? "hostaddr" : "host"; if ($this->db_secure == true) { - $tmp .= " database.system = \"pgsql://".(filter_var($this->db_host, FILTER_VALIDATE_IP) ? "hostaddr" : "host")."=".$this->db_host." port=".$this->db_port." dbname=".$this->db_name." user=".$this->db_username." password=".$this->db_password." sslmode=verify-ca sslrootcert=".$this->db_cert_authority." options=''\";\n"; - $tmp .= " database.switch = \"pgsql://".(filter_var($this->db_host, FILTER_VALIDATE_IP) ? "hostaddr" : "host")."=".$this->db_host." port=".$this->db_port." dbname=freeswitch user=".$this->db_username." password=".$this->db_password." sslmode=verify-ca sslrootcert=".$this->db_cert_authority." options=''\";\n"; + $tmp .= " database.system = \"pgsql://".$host."=".$this->db_host." port=".$this->db_port." dbname=".$this->db_name." user=".$this->db_username." password=".$this->db_password." sslmode=verify-ca sslrootcert=".$this->db_cert_authority." options=''\";\n"; + $tmp .= " database.switch = \"pgsql://".$host."=".$this->db_host." port=".$this->db_port." dbname=freeswitch user=".$this->db_username." password=".$this->db_password." sslmode=verify-ca sslrootcert=".$this->db_cert_authority." options=''\";\n"; } else { - $tmp .= " database.system = \"pgsql://".(filter_var($this->db_host, FILTER_VALIDATE_IP) ? "hostaddr" : "host")."=".$this->db_host." port=".$this->db_port." dbname=".$this->db_name." user=".$this->db_username." password=".$this->db_password." options=''\";\n"; - $tmp .= " database.switch = \"pgsql://".(filter_var($this->db_host, FILTER_VALIDATE_IP) ? "hostaddr" : "host")."=".$this->db_host." port=".$this->db_port." dbname=freeswitch user=".$this->db_username." password=".$this->db_password." options=''\";\n"; + $tmp .= " database.system = \"pgsql://".$host."=".$this->db_host." port=".$this->db_port." dbname=".$this->db_name." user=".$this->db_username." password=".$this->db_password." options=''\";\n"; + $tmp .= " database.switch = \"pgsql://".$host."=".$this->db_host." port=".$this->db_port." dbname=freeswitch user=".$this->db_username." password=".$this->db_password." options=''\";\n"; } } elseif ($this->db_type == "sqlite") {