Merge branch 'friendica:develop' into feature-openwebauth

[friendica.git] / static / defaults.config.php

diff --git a/static/defaults.config.php b/static/defaults.config.php
index b3175c5d7394fd774fd8aaf970c7b12cee271ff5..d0b8262ac76fbad76faa84d99c1f0439db2a5589 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -106,7 +106,7 @@ return [
                'always_show_preview' => false,
 
                // ap_always_bcc (Boolean)
-               // Adresses non-mentioned ActivityPub receivers by BCC instead of CC. Increases privacy, decreases performance.
+               // Addresses non-mentioned ActivityPub receivers by BCC instead of CC. Increases privacy, decreases performance.
                'ap_always_bcc' => false,
 
                // archival_days (Integer)
@@ -132,6 +132,10 @@ return [
                // The value has to start with the scheme and end with a "/"
                'avatar_cache_url' => '',
 
+               // basicauth (Boolean)
+               // Controls if login via BasicAuth is possible (default is true)
+               'basicauth' => true,
+
                // big_emojis (Boolean)
                // Display "Emoji Only" posts in big.
                'big_emojis' => false,
@@ -237,6 +241,10 @@ return [
                // Periodically delete waiting database processes.
                'delete_sleeping_processes' => false,
 
+               // delete-blocked-servers (Boolean)
+               // Delete blocked servers if there are no foreign key violations.
+               'delete-blocked-servers' => false,
+
                // dice_profiler_threshold (Float)
                // For profiling Dice class creation (0 = disabled, >0 = seconds threshold for profiling)
                'dice_profiler_threshold' => 0.5,
@@ -282,8 +290,12 @@ return [
                // restricts develop log writes to requests originating from this IP address.
                'dlogip' => '',
 
+               // emoji_activities (Boolean)
+               // Display received activities (like, dislike, reshare) as emojis
+               'emoji_activities' => false,
+
                // expire-notify-priority (integer)
-               // Priority for the expirary notification
+               // Priority for the expiry notification
                'expire-notify-priority' => Friendica\Core\Worker::PRIORITY_LOW,
 
                // fetch_by_worker (Boolean)
@@ -329,6 +341,14 @@ return [
                // Resolve IPV4 addresses only. Don't resolve to IPV6.
                'ipv4_resolve' => false,
 
+               // ini_max_execution_time (False|Integer)
+               // Set the number of seconds a script is allowed to run. Default unlimited for Friendica, false to use the system value.
+               'ini_max_execution_time' => 0,
+
+               // ini_pcre_backtrack_limit (False|Integer)
+               // This has to be quite large to deal with embedded private photos. False to use the system value.
+               'ini_pcre_backtrack_limit' => 500000,
+
                // invitation_only (Boolean)
                // If set true registration is only possible after a current member of the node has sent an invitation.
                'invitation_only' => false,
@@ -364,6 +384,11 @@ return [
                // If activated, all hashtags will point to the local server.
                'local_tags' => false,
 
+               // lock_driver (semaphore|database|memcache|memcached|redis|apcu)
+               // Whether to use semaphores, the database, Memcache, Memcached, Redis or APCu to handle locks.
+               // Default is auto detection which tries semaphores first, then falls back to the cache driver.
+               'lock_driver' => '',
+
                // logger_config (String)
                // Sets the logging adapter of Friendica globally (monolog, syslog, stream)
                'logger_config' => 'stream',
@@ -478,6 +503,10 @@ return [
                // Don't show smilies.
                'no_smilies' => false,
 
+               // optimize_all_tables (Boolean)
+               // Optimizes all tables instead of only tables like workerqueue or the cache
+               'optimize_all_tables' => false,
+
                // paranoia (Boolean)
                // Log out users if their IP address changed.
                'paranoia' => false,
@@ -494,12 +523,16 @@ return [
                // Sets the ImageMagick compression level for PNG images. Values range from 0 (uncompressed) to 9 (most compressed).
                'png_quality' => 8,
 
+               // process_view (Boolean)
+               // Process the "View" activity that is used by Peertube. View activities are displayed, when "emoji_activities" are enabled.
+               'process_view' => false,
+
                // profiler (Boolean)
                // Enable internal timings to help optimize code. Needed for "rendertime" addon.
                'profiler' => false,
 
                // pushpoll_frequency (Integer)
-               // Frequency of contact poll for subhub contact using the DFRM or OStatus network.
+               // Frequency of contact poll for subhub contact using the DFRN or OStatus network.
                // Available values:
                // - 5 = every month
                // - 4 = every week