From 97668c2e7f4b035f96b7c59076c144b58def20b6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 9 Nov 2020 16:50:06 +0100 Subject: [PATCH] Revert "Add domain" This reverts commit 155698f1476e8d04079eef06de68a0f5474414ae. --- conf/config.inc.php | 2 +- scripts/install | 1 - scripts/upgrade | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index 2afb781..9b4d354 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -44,7 +44,7 @@ $config['db_dsnw'] = 'mysql://__DBUSER__:__DBPASS__@localhost/__DBNAME__'; // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %s - domain name after the '@' from e-mail address provided at login screen // For example %n = mail.domain.tld, %t = domain.tld -$config['default_host'] = '__DOMAIN__'; +$config['default_host'] = 'localhost'; // SMTP server host (for sending mails). // To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// diff --git a/scripts/install b/scripts/install index 508aae9..c96f525 100644 --- a/scripts/install +++ b/scripts/install @@ -130,7 +130,6 @@ ynh_replace_string --match_string="__DBUSER__" --replace_string="$db_name" --tar ynh_replace_string --match_string="__DBPASS__" --replace_string="$db_pwd" --target_file="$rc_conf" ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$rc_conf" ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$rc_conf" #================================================= # INSTALL ADDITIONAL PLUGINS diff --git a/scripts/upgrade b/scripts/upgrade index 4650c0c..3a6f394 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -155,8 +155,7 @@ then ynh_replace_string --match_string="__DBPASS__" --replace_string="$db_pwd" --target_file="$rc_conf" ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$rc_conf" ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" - ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$rc_conf" - + #================================================= # UPDATE DEPENDENCIES WITH COMPOSER #=================================================