Merge pull request #10409 from annando/api-link-header

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

diff --git a/static/defaults.config.php b/static/defaults.config.php
index 3e05cab2ba8e045145b08b8323e290bb1cc96e42..25a23bf9dd64a9cdcccaf99c2cad6bd677dbb6ca 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -121,6 +121,10 @@ return [
                // Deny public access to the local user directory.
                'block_local_dir' => false,
 
+               // blocked_tags (String)
+               // Comma separated list of hash tags that shouldn't be displayed in the trending tags
+               'blocked_tags' => '',
+
                // community_no_sharer (Boolean)
                // Don't display sharing accounts on the global community
                'community_no_sharer' => false,
@@ -566,6 +570,10 @@ return [
                // xrd_timeout (Integer)
                // Timeout in seconds for fetching the XRD links.
                'xrd_timeout' => 20,
+
+               // proxy_file_chmod (Octal Integer like 0640)
+               // If set, defines the files permissions for downloaded files in the /proxy/ directory, default is system-dependent
+               'proxy_file_chmod' => 0,
        ],
        'experimental' => [
                // exp_themes (Boolean)