From 7a6972efb52d5c293aae703af30378083c593b3e Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 26 Dec 2012 17:20:57 -0800 Subject: [PATCH] provide a default directory configuration (client) --- install/htconfig.sample.php | 16 ++++++++++------ view/en/htconfig.tpl | 9 ++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index 47dcb7e12..ebfc84543 100644 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -52,11 +52,15 @@ $a->config['system']['maximagesize'] = 800000; $a->config['php_path'] = 'php'; -// You shouldn't need to change anything else. -// Location of global directory submission page. -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts @@ -64,11 +68,11 @@ $a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; // allowed themes (change this from admin panel after installation) -$a->config['system']['allowed_themes'] = 'duepuntozero'; +$a->config['system']['allowed_themes'] = 'redbasic'; // default system theme -$a->config['system']['theme'] = 'duepuntozero'; +$a->config['system']['theme'] = 'redbasic'; diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index de595685e..f35d3292d 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -42,10 +42,13 @@ $a->config['system']['maximagesize'] = 800000; $a->config['system']['php_path'] = '$phpath'; -// Location of global directory submission page. +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; // default system theme