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

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index 8f64899657da644efcbf21f182d2737181189cc5..6f6e3faf96b5be465ec69f61a4eb713e1226843c 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -52,8 +52,16 @@ $a->config['php_path'] = 'php';
 // 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;
+
+ 
\ No newline at end of file