Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / view / en / htconfig.tpl

diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index fda38b33adc458a275d3ef588d134b536eac0ada..c7c19bf69e1c69c94869d52da85fc2aad67a12f4 100644 (file)
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -50,8 +50,15 @@ $a->config['php_path'] = '$phpath';
 // Location of global directory submission page.
 
 $a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
 $a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
 
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+