Merge pull request #3513 from Hypolite/bug/update-directory-url
Update remaining "dir.friendi.ca" instances
This commit is contained in:
commit
045d7d353f
2
boot.php
2
boot.php
|
@ -1375,7 +1375,7 @@ function get_server() {
|
||||||
$server = get_config("system", "directory");
|
$server = get_config("system", "directory");
|
||||||
|
|
||||||
if ($server == "") {
|
if ($server == "") {
|
||||||
$server = "http://dir.friendi.ca";
|
$server = "http://dir.friendica.social";
|
||||||
}
|
}
|
||||||
|
|
||||||
return($server);
|
return($server);
|
||||||
|
|
|
@ -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.
|
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:
|
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 ##
|
## jabber ##
|
||||||
* **debug** (Boolean) - Enable debug level for the jabber account synchronisation.
|
* **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** -
|
* **default_service_class** -
|
||||||
* **delivery_batch_count** - Number of deliveries per process. Default value is 1. (Disabled when using the worker)
|
* **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.
|
* **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_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.
|
* **disable_url_validation** (Boolean) - Disables the DNS lookup of an URL.
|
||||||
* **dlogfile - location of the developer log file
|
* **dlogfile - location of the developer log file
|
||||||
|
|
|
@ -69,7 +69,7 @@ $a->config['system']['no_regfullname'] = true;
|
||||||
//$a->config['system']['block_local_dir'] = false;
|
//$a->config['system']['block_local_dir'] = false;
|
||||||
|
|
||||||
// Location of the global directory
|
// 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
|
// turn on friendica's log
|
||||||
$a->config['system']['debugging'] = true;
|
$a->config['system']['debugging'] = true;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
/* ********************************************************************
|
/* ********************************************************************
|
||||||
* The following configuration has to be within the .htconfig file
|
* The following configuration has to be within the .htconfig file
|
||||||
* and will not be overruled by decisions made in the admin panel.
|
* and will not be overruled by decisions made in the admin panel.
|
||||||
*
|
*
|
||||||
* See below for variables that may be overruled by 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
|
* Changes made below will only have an effect if the database does
|
||||||
* not contain any configuration for the friendica system.
|
* not contain any configuration for the friendica system.
|
||||||
* *********************************************************************/
|
* *********************************************************************/
|
||||||
|
|
||||||
// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
|
// 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.
|
// 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;
|
//$a->config['system']['block_local_dir'] = false;
|
||||||
|
|
||||||
// Location of the global directory
|
// 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
|
// Authentication cookie lifetime, in days
|
||||||
$a->config['system']['auth_cookie_lifetime'] = 7;
|
$a->config['system']['auth_cookie_lifetime'] = 7;
|
||||||
|
|
Loading…
Reference in a new issue