From cbd3edbc05999310b7f3cca5aa3d0124b26f7c6e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 2 Jun 2017 22:15:43 -0400 Subject: [PATCH] Update remaining "dir.friendi.ca" instances --- boot.php | 2 +- doc/htconfig.md | 4 ++-- util/htconfig.vagrant.php | 2 +- view/templates/htconfig.tpl | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/boot.php b/boot.php index 48381f543..453b48475 100644 --- a/boot.php +++ b/boot.php @@ -1375,7 +1375,7 @@ function get_server() { $server = get_config("system", "directory"); if ($server == "") { - $server = "http://dir.friendi.ca"; + $server = "http://dir.friendica.social"; } return($server); diff --git a/doc/htconfig.md b/doc/htconfig.md index 2c8b44439..542b42b29 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -14,7 +14,7 @@ Especially don't do that with undocumented values. The header of the section describes the category, the value is the parameter. Example: To set the directory value please add this line to your .htconfig.php: - $a->config['system']['directory'] = 'http://dir.friendi.ca'; + $a->config['system']['directory'] = 'http://dir.friendica.social'; ## jabber ## * **debug** (Boolean) - Enable debug level for the jabber account synchronisation. @@ -38,7 +38,7 @@ Example: To set the directory value please add this line to your .htconfig.php: * **default_service_class** - * **delivery_batch_count** - Number of deliveries per process. Default value is 1. (Disabled when using the worker) * **diaspora_test** (Boolean) - For development only. Disables the message transfer. -* **directory** - The path to global directory. If not set then "http://dir.friendi.ca" is used. +* **directory** - The path to global directory. If not set then "http://dir.friendica.social" is used. * **disable_email_validation** (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS. * **disable_url_validation** (Boolean) - Disables the DNS lookup of an URL. * **dlogfile - location of the developer log file diff --git a/util/htconfig.vagrant.php b/util/htconfig.vagrant.php index 71e9d673f..c33f9941e 100644 --- a/util/htconfig.vagrant.php +++ b/util/htconfig.vagrant.php @@ -69,7 +69,7 @@ $a->config['system']['no_regfullname'] = true; //$a->config['system']['block_local_dir'] = false; // Location of the global directory -$a->config['system']['directory'] = 'http://dir.friendi.ca'; +$a->config['system']['directory'] = 'http://dir.friendica.social'; // turn on friendica's log $a->config['system']['debugging'] = true; diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 1aba902ad..02cf67f39 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -3,7 +3,7 @@ /* ******************************************************************** * The following configuration has to be within the .htconfig file * and will not be overruled by decisions made in the admin panel. - * + * * See below for variables that may be overruled by the admin panel. * ********************************************************************/ @@ -43,7 +43,7 @@ $a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', * Changes made below will only have an effect if the database does * not contain any configuration for the friendica system. * *********************************************************************/ - + // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". // It can be changed later and only applies to timestamps for anonymous viewers. @@ -98,7 +98,7 @@ $a->config['system']['no_regfullname'] = true; //$a->config['system']['block_local_dir'] = false; // Location of the global directory -$a->config['system']['directory'] = 'http://dir.friendi.ca'; +$a->config['system']['directory'] = 'http://dir.friendica.social'; // Authentication cookie lifetime, in days $a->config['system']['auth_cookie_lifetime'] = 7;