GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[FORMATTING][DEFAULTS] Fix formatting and remove redundant config defaults

This commit is contained in:
Hugo Sales 2020-07-10 11:10:18 +00:00 committed by Hugo Sales
parent b7b50f749b
commit 4f85594bec
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 158 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.php_cs
View File

@ -273,6 +273,6 @@ return PhpCsFixer\Config::create()
->exclude('var') ->exclude('var')
->exclude('docker') ->exclude('docker')
->exclude('src/Entity') ->exclude('src/Entity')
->notPath('src/Core/DefaultSettings.php') ->notPath('src/Core/DB/DefaultSettings.php')
->in(__DIR__) ->in(__DIR__)
); );

344
src/Core/DB/DefaultSettings.php
View File

@ -41,102 +41,84 @@ abstract class DefaultSettings
public static array $defaults; public static array $defaults;
public static function setDefaults() public static function setDefaults()
{ {
self::$defaults = ['site' => ['name' => $_ENV['SOCIAL_SITENAME'] ?? 'Another social instance', self::$defaults = [
'server' => $_ENV['SOCIAL_DOMAIN'] ?? 'localhost', 'site' => [
'notice' => null, // site wide notice text 'name' => $_ENV['SOCIAL_SITENAME'] ?? 'Another social instance',
'theme' => 'default', 'server' => $_ENV['SOCIAL_DOMAIN'],
'logo' => null, 'notice' => null, // site wide notice text
'language' => 'en', 'theme' => 'default',
'detect_language' => true, 'logo' => null,
'languages' => I18nHelper::get_all_languages(), 'language' => 'en',
'email' => $_ENV['SERVER_ADMIN'] ?? $_ENV['SOCIAL_ADMIN_EMAIL'] ?? null, 'detect_language' => true,
'recovery_disclose' => false, // Whether to not say that we found the email in the database, when asking for recovery 'languages' => I18nHelper::get_all_languages(),
'timezone' => 'UTC', 'email' => $_ENV['SERVER_ADMIN'] ?? $_ENV['SOCIAL_ADMIN_EMAIL'] ?? null,
'brought_by' => null, 'recovery_disclose' => false, // Whether to not say that we found the email in the database, when asking for recovery
'brought_by_url' => null, 'timezone' => 'UTC',
'closed' => false, 'brought_by' => null,
'invite_only' => true, 'brought_by_url' => null,
'private' => false, 'closed' => false,
'ssl' => 'always', 'register_type' => 'public',
'ssl_proxy' => false, // set to true to force GNU social to think it is HTTPS (i.e. using reverse proxy to enable it) 'nickname' => $_ENV['SOCIAL_ADMIN_NICK'],
'duplicate_time_limit' => 60, // default for same person saying the same thing 'ssl' => 'always',
'text_limit' => 1000, // in chars; 0 == no limit 'ssl_proxy' => false, // set to true to force GNU social to think it is HTTPS (i.e. using reverse proxy to enable it)
'x-static-delivery' => null, 'duplicate_time_limit' => 60, // default for same person saying the same thing
], 'text_limit' => 1000, // in chars; 0 == no limit
'security' => ['hash_algos' => ['sha1', 'sha256', 'sha512']], // set to null for anything that hash_hmac() can handle (and is in hash_algos()) 'x_static_delivery' => null,
'db' => ['mirror' => null], // TODO implement
'fix' => ['fancy_urls' => true, // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
'http' => true, // set this to true if you have upgraded your site from http=>https
], ],
'queue' => ['enabled' => true, 'security' => ['hash_algos' => ['sha1', 'sha256', 'sha512']], // set to null for anything that hash_hmac() can handle (and is in hash_algos())
'daemon' => false, // Use queuedaemon. Default to false 'db' => ['mirror' => null], // TODO implement
'threads' => null, // an empty value here uses processor count to determine 'cache' => [
'subsystem' => false, // default to database, or 'stomp' 'notice_max_count' => 128,
'basename' => '/queue/gnusocial/',
'control_channel' => '/topic/gnusocial/control', // broadcasts to all queue daemons
'monitor' => null, // URL to monitor ping endpoint (work in progress)
'soft_limit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully
'spawn_delay' => 1, // Wait at least N seconds between (re)spawns of child processes to avoid slamming the queue server with subscription startup
'debug_memory' => false, // true to spit memory usage to log
'stomp_server' => null,
'stomp_username' => null,
'stomp_password' => null,
'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled
'stomp_transactions' => true, // use STOMP transactions to aid in detecting failures (supported by ActiveMQ, but not by all)
'stomp_acks' => true, // send acknowledgements after successful processing (supported by ActiveMQ, but not by all)
'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all)
'max_retries' => 10, // drop messages after N failed attempts to process (Stomp)
'dead_letter_dir' => false, // set to directory to save dropped messages into (Stomp)
], ],
'avatar' => ['server' => null, 'avatar' => [
'url_base' => '/avatar/', 'server' => null,
'ssl' => null, 'ssl' => null,
'dir' => INSTALLDIR . '/file/avatar/', 'dir' => INSTALLDIR . '/file/avatar/',
'max_size_px' => 300, 'max_size_px' => 300,
], ],
'javascript' => ['server' => null, 'javascript' => [
'url_base' => '/js/', 'server' => null,
'ssl' => null, 'ssl' => null,
'bust_frames' => true,
], ],
'attachments' => ['server' => null, 'attachments' => [
'url_base' => '/file/', 'server' => null,
'ssl' => null, 'ssl' => null,
'dir' => INSTALLDIR . '/file/uploads/', 'dir' => INSTALLDIR . '/file/uploads/',
'supported' => ['application/vnd.oasis.opendocument.chart' => 'odc', 'supported' => [
'application/vnd.oasis.opendocument.formula' => 'odf', 'application/vnd.oasis.opendocument.chart' => 'odc',
'application/vnd.oasis.opendocument.graphics' => 'odg', 'application/vnd.oasis.opendocument.formula' => 'odf',
'application/vnd.oasis.opendocument.graphics-template' => 'otg', 'application/vnd.oasis.opendocument.graphics' => 'odg',
'application/vnd.oasis.opendocument.image' => 'odi', 'application/vnd.oasis.opendocument.graphics-template' => 'otg',
'application/vnd.oasis.opendocument.presentation' => 'odp', 'application/vnd.oasis.opendocument.image' => 'odi',
'application/vnd.oasis.opendocument.presentation-template' => 'otp', 'application/vnd.oasis.opendocument.presentation' => 'odp',
'application/vnd.oasis.opendocument.spreadsheet' => 'ods', 'application/vnd.oasis.opendocument.presentation-template' => 'otp',
'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots', 'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
'application/vnd.oasis.opendocument.text' => 'odt', 'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots',
'application/vnd.oasis.opendocument.text-master' => 'odm', 'application/vnd.oasis.opendocument.text' => 'odt',
'application/vnd.oasis.opendocument.text-template' => 'ott', 'application/vnd.oasis.opendocument.text-master' => 'odm',
'application/vnd.oasis.opendocument.text-web' => 'oth', 'application/vnd.oasis.opendocument.text-template' => 'ott',
'application/pdf' => 'pdf', 'application/vnd.oasis.opendocument.text-web' => 'oth',
'application/zip' => 'zip', 'application/pdf' => 'pdf',
'application/x-bzip2' => 'bz2', 'application/zip' => 'zip',
'application/x-go-sgf' => 'sgf', 'application/x-bzip2' => 'bz2',
'application/xml' => 'xml', 'application/x-go-sgf' => 'sgf',
'application/gpx+xml' => 'gpx', 'application/xml' => 'xml',
image_type_to_mime_type(IMAGETYPE_PNG) => image_type_to_extension(IMAGETYPE_PNG), 'application/gpx+xml' => 'gpx',
image_type_to_mime_type(IMAGETYPE_JPEG) => image_type_to_extension(IMAGETYPE_JPEG), image_type_to_mime_type(IMAGETYPE_PNG) => image_type_to_extension(IMAGETYPE_PNG),
image_type_to_mime_type(IMAGETYPE_GIF) => image_type_to_extension(IMAGETYPE_GIF), image_type_to_mime_type(IMAGETYPE_JPEG) => image_type_to_extension(IMAGETYPE_JPEG),
image_type_to_mime_type(IMAGETYPE_ICO) => image_type_to_extension(IMAGETYPE_ICO), image_type_to_mime_type(IMAGETYPE_GIF) => image_type_to_extension(IMAGETYPE_GIF),
'image/svg+xml' => 'svg', // No built-in constant image_type_to_mime_type(IMAGETYPE_ICO) => image_type_to_extension(IMAGETYPE_ICO),
'audio/ogg' => 'ogg', 'image/svg+xml' => 'svg', // No built-in constant
'audio/mpeg' => 'mpg', 'audio/ogg' => 'ogg',
'audio/x-speex' => 'spx', 'audio/mpeg' => 'mpg',
'application/ogg' => 'ogx', 'audio/x-speex' => 'spx',
'text/plain' => 'txt', 'application/ogg' => 'ogx',
'video/mpeg' => 'mpeg', 'text/plain' => 'txt',
'video/mp4' => 'mp4', 'video/mpeg' => 'mpeg',
'video/ogg' => 'ogv', 'video/mp4' => 'mp4',
'video/quicktime' => 'mov', 'video/ogg' => 'ogv',
'video/webm' => 'webm', 'video/quicktime' => 'mov',
'video/webm' => 'webm',
], ],
'file_quota' => Common::get_preferred_php_upload_limit(), 'file_quota' => Common::get_preferred_php_upload_limit(),
'user_quota' => Common::size_str_to_int('200M'), 'user_quota' => Common::size_str_to_int('200M'),
@ -146,46 +128,43 @@ abstract class DefaultSettings
'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info 'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info
'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages. 'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages.
'ext_blacklist' => [], 'ext_blacklist' => [],
'filename' => 'hash',
'memory_limit' => '1024M', // PHP memory limit to use temporarily when handling images 'memory_limit' => '1024M', // PHP memory limit to use temporarily when handling images
], ],
'thumbnail' => ['server' => null, 'thumbnail' => [
'url_base' => '/thumb/', 'server' => null,
'ssl' => null, 'ssl' => null,
'dir' => INSTALLDIR . '/file/thumbnails/', // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/') 'dir' => INSTALLDIR . '/file/thumbnails/', // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] . '/thumb/')
'crop' => false, // overridden to true if thumb height === null 'crop' => false, // overridden to true if thumb height === null
'max_size_px' => 1000, // thumbs with an edge larger than this will not be generated 'max_size_px' => 1000, // thumbs with an edge larger than this will not be generated
'width' => 450, 'width' => 450,
'height' => 600, 'height' => 600,
'upscale' => false, 'upscale' => false,
'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true="allow animated" 'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true="allow animated"
], ],
'theme' => ['server' => null, 'theme' => [
'url_base' => '/theme/', 'server' => null,
'ssl' => null, 'ssl' => null,
'dir' => INSTALLDIR . '/public/theme/', 'dir' => INSTALLDIR . '/public/theme/',
], ],
'plugins' => ['server' => null, 'plugins' => [
'url_base' => null, 'server' => null,
'ssl' => null, 'ssl' => null,
'core' => [], 'core' => [],
'default' => [], 'default' => [],
'locale_path' => null, // Set to a path to use *instead of* each plugin's own locale subdirectories 'locale_path' => null, // Set to a path to use *instead of* each plugin's own locale subdirectories
], ],
'license' => ['type' => 'cc', // can be 'cc', 'allrightsreserved', 'private' 'license' => [
'owner' => null, // can be name of content owner e.g. for enterprise 'type' => 'cc', // can be 'cc', 'allrightsreserved', 'private'
'url' => 'https://creativecommons.org/licenses/by/4.0/', 'owner' => null, // can be name of content owner e.g. for enterprise
'title' => 'Creative Commons Attribution 4.0', 'url' => 'https://creativecommons.org/licenses/by/4.0/',
'image' => '/theme/licenses/cc_by_4.0.png', 'title' => 'Creative Commons Attribution 4.0',
'image' => '/theme/licenses/cc_by_4.0.png',
], ],
'mail' => ['backend' => 'mail', 'nickname' => [
'params' => null, 'blacklist' => ['doc', 'main', 'avatar', 'theme'],
'domain_check' => true, 'featured' => [],
], ],
'nickname' => ['blacklist' => ['doc', 'main', 'avatar', 'theme'], 'profile' => [
'featured' => [],
],
'profile' => ['banned' => [],
'bio_text_limit' => null, 'bio_text_limit' => null,
'allow_nick_change' => false, 'allow_nick_change' => false,
'allow_private_stream' => true, // whether to allow setting stream to private ("only followers can read") 'allow_private_stream' => true, // whether to allow setting stream to private ("only followers can read")
@ -194,84 +173,75 @@ abstract class DefaultSettings
'delete' => false, 'delete' => false,
'move' => false, 'move' => false,
], ],
'image' => ['jpegquality' => 85], 'image' => ['jpegquality' => 85],
'theme_upload' => ['enabled' => true,
'formats' => ['zip', 'tar', 'gz', 'tar.gz'], ],
'foaf' => ['mbox_sha1sum' => false], 'foaf' => ['mbox_sha1sum' => false],
'public' => ['local_only' => false, 'public' => [
'blacklist' => [], 'local_only' => false,
'exclude_sources' => [], 'blacklist' => [],
], 'exclude_sources' => [],
'throttle' => ['enabled' => true, // whether to throttle posting dents
'count' => 20, // number of allowed messages in timespan
'timespan' => 600, // timespan for throttling
], ],
'invite' => ['enabled' => true], 'invite' => ['enabled' => true],
'tag' => ['dropoff' => 86400 * 10, // controls weighting based on age 'tag' => [
'cutoff' => 86400 * 90, // only look at notices posted in last 90 days 'dropoff' => 86400 * 10, // controls weighting based on age
'cutoff' => 86400 * 90, // only look at notices posted in last 90 days
], ],
'popular' => ['dropoff' => 86400 * 10, // controls weighting based on age 'popular' => [
'cutoff' => 86400 * 90, // only look at notices favorited in last 90 days 'dropoff' => 86400 * 10, // controls weighting based on age
'cutoff' => 86400 * 90, // only look at notices favorited in last 90 days
], ],
'daemon' => ['piddir' => sys_get_temp_dir(), 'new_users' => [
'user' => false, 'default_subscriptions' => null,
'group' => false, 'welcome_user' => null,
], ],
'ping' => ['notify' => [], 'linkify' => [ // "bare" below means "without schema", like domain.com vs. https://domain.com
'timeout' => 2, 'bare_domains' => false, // convert domain.com to <a href="http://domain.com/" ...>domain.com</a> ?
'ipv4' => false, // convert IPv4 addresses to hyperlinks?
'ipv6' => false, // convert IPv6 addresses to hyperlinks?
], ],
'new_users' => ['default_subscriptions' => null, 'group' => [
'welcome_user' => null, 'max_aliases' => 3,
'description_limit' => null,
], ],
'linkify' => // "bare" below means "without schema", like domain.com vs. https://domain.com 'people_tag' => [
['bare_domains' => false, // convert domain.com to <a href="http://domain.com/" ...>domain.com</a> ? 'max_tags' => 100, // maximum number of tags a user can create.
'linkify_ipv4' => false, // convert IPv4 addresses to hyperlinks? 'max_people' => 500, // maximum no. of people with the same tag by the same user
'linkify_ipv6' => false, // convert IPv6 addresses to hyperlinks? 'allow_tagging' => ['local' => true, 'remote' => true],
], 'description_limit' => null,
'group' => ['max_aliases' => 3,
'description_limit' => null,
],
'people_tag' => ['max_tags' => 100, // maximum number of tags a user can create.
'max_people' => 500, // maximum no. of people with the same tag by the same user
'allow_tagging' => ['local' => true, 'remote' => true], // equivalent to array()
'description_limit' => null,
], ],
'search' => ['type' => 'like'], 'search' => ['type' => 'like'],
'html_filter' => ['tags' => ['img', 'video', 'audio', 'script']], 'html_filter' => ['tags' => ['img', 'video', 'audio', 'script']],
'notice' => ['content_limit' => null, 'notice' => [
'allow_private' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers. 'content_limit' => null,
'hide_banned' => true, // Whether to hide silenced users from timelines 'allow_private' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers.
'hide_banned' => true, // whether to hide silenced users from timelines
], ],
'message' => ['content_limit' => null], 'message' => ['content_limit' => null],
'location' => ['share' => 'user'], 'location' => ['share' => 'user'],
'admin' => ['panels' => ['site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins']], 'robots_txt' => [
'single_user' => ['enabled' => $_ENV['SOCIAL_SITE_PROFILE'] ?? '' == 'single_user', 'crawl_delay' => 0,
'nickname' => null, 'disallow' => ['main', 'settings', 'admin', 'search', 'message'],
], ],
'robots_txt' => ['crawl_delay' => 0, 'nofollow' => [
'disallow' => ['main', 'settings', 'admin', 'search', 'message'], 'subscribers' => true,
'members' => true,
'peopletag' => true,
'external' => 'sometimes', // Options: 'sometimes', 'never', default = 'sometimes'
], ],
'nofollow' => ['subscribers' => true, 'url_shortener' => [
'members' => true, 'service' => 'internal',
'peopletag' => true, 'max_url_length' => 100,
'external' => 'sometimes', // Options: 'sometimes', 'never', default = 'sometimes' 'max_notice_length' => null,
], ],
'url_shortener' => ['service' => 'internal', 'http' => [ // HTTP client settings when contacting other sites
'max_url_length' => 100, 'ssl_ca_file' => '/docker/certbot/files/live/',
'max_notice_length' => null, 'timeout' => (int) (ini_get('default_socket_timeout')), // effectively should be this by default already, but this makes it more explicitly configurable for you users .)
'proxy_host' => null,
'proxy_port' => null,
'proxy_user' => null,
'proxy_password' => null,
'proxy_auth_scheme' => null,
], ],
'http' => // HTTP client settings when contacting other sites 'discovery' => ['CORS' => false], // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
['ssl_ca_file' => '/docker/certbot/files/live/',
'timeout' => (int) (ini_get('default_socket_timeout')), // effectively should be this by default already, but this makes it more explicitly configurable for you users .)
'proxy_host' => null,
'proxy_port' => null,
'proxy_user' => null,
'proxy_password' => null,
'proxy_auth_scheme' => null,
],
'discovery' => ['CORS' => false], // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
'performance' => ['high' => false], // disable some features for higher performance; default false
'login_command' => ['enabled' => false],
]; ];
self::loadDefaults($_ENV['APP_ENV'] == 'prod'); self::loadDefaults($_ENV['APP_ENV'] == 'prod');