Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index 0c365579cbc37d4019a2ef3cbf2d3ed51c740359..872572654a705cec36d5f39d43353d4f7fd64209 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -1,8 +1,16 @@
 <?php
 
-// Set the following for your MySQL installation
+// If automatic system installation fails: 
+
 // Copy or rename this file to .htconfig.php
 
+// Why .htconfig.php? Because it contains sensitive information which could
+// give somebody complete control of your database. Apache's default 
+// configuration denies access to and refuses to serve any file beginning 
+// with .ht
+
+// Then set the following for your MySQL installation
+
 $db_host = 'your.mysqlhost.com';
 $db_user = 'mysqlusername';
 $db_pass = 'mysqlpassword';
@@ -11,31 +19,72 @@ $db_data = 'mysqldatabasename';
 // 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.
 
-$default_timezone = 'Australia/Sydney';
+$default_timezone = 'America/Los_Angeles';
 
 // What is your site name?
 
-$a->config['sitename'] = "DFRN developer";
+$a->config['sitename'] = "Friendica Social Network";
 
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
 // Be certain to create your own personal account before setting 
 // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
 // the registration page. REGISTER_APPROVE requires you set 'admin_email'
 // to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
+// and/or approve/deny the request. 
+
+// In order to perform system administration via the admin panel, admin_email
+// must precisely match the email address of the person logged in.
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
 $a->config['admin_email'] = '';
 
-// Maximum size of an imported message, 0 is unlimited (but our database 'text' element is limited to 65535).
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
 
-$a->config['max_import_size'] = 10000;
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
 
 // Location of PHP command line processor
 
 $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.dfrn.org/submit';
+$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;
+
+// allowed themes (change this from admin panel after installation)
+
+$a->config['system']['allowed_themes'] = 'dispy,quattro,vier,darkzero,duepuntozero,greenzero,purplezero,slackr,diabook';
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+
+// By default allow pseudonyms
+
+$a->config['system']['no_regfullname'] = true;
+
+// If set to true the priority settings of ostatus contacts are used
+$a->config['system']['ostatus_use_priority'] = false;
+
+// If enabled, all items are cached in the given directory
+$a->config['system']['itemcache'] = "";
+
+// If enabled, the lockpath is used for a lockfile to check if the poller is running
+$a->config['system']['lockpath'] = "";