friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-09-06 06:39:27 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity

Merge pull request #6199 from MrPetovan/task/move-config-to-php-array

Browse source 
Move config to PHP array
This commit is contained in:
Michael Vogel 2018-11-26 23:57:56 +01:00 • committed by GitHub
commit ea4e772b1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 1117 additions and 1009 deletions
Download patch file Download diff file Expand all files Collapse all files

35
view/templates/local.config.tpl Normal file
View file

@ -0,0 +1,35 @@
<?php
// Local configuration
// If you're unsure about what any of the config keys below do, please check the config/defaults.config.php for detailed
// documentation of their data type and behavior.
return [
'database' => [
'hostname' => '{{$dbhost}}',
'username' => '{{$dbuser}}',
'password' => '{{$dbpass}}',
'database' => '{{$dbdata}}',
'charset' => 'utf8mb4',
],
// ****************************************************************
// The configuration below will be overruled by the admin panel.
// Changes made below will only have an effect if the database does
// not contain any configuration for the friendica system.
// ****************************************************************
'config' => [
'php_path' => '{{$phpath}}',
'admin_email' => '{{$adminmail}}',
'sitename' => 'Friendica Social Network',
'register_policy' => REGISTER_OPEN,
'max_import_size' => 200000,
],
'system' => [
'urlpath' => '{{$urlpath}}',
'default_timezone' => '{{$timezone}}',
'language' => '{{$language}}',
],
];

56
view/templates/local.ini.tpl
View file

@ -1,56 +0,0 @@
<?php return <<<INI
; If you're unsure about what any of the config keys below do, please check the config/defaults.ini.php for detailed
; documentation of their data type and behavior.
[database]
hostname = "{{$dbhost}}"
username = "{{$dbuser}}"
password = "{{$dbpass}}"
database = "{{$dbdata}}"
charset = utf8mb4
; ****************************************************************
; Some config values below can be overruled from the admin settings
; ****************************************************************
[config]
php_path = "{{$phpath}}"
admin_email = "{{$adminmail}}"
sitename = Friendica Social Network
register_policy = REGISTER_OPEN
register_text =
max_import_size = 200000
[system]
urlpath = "{{$urlpath}}"
default_timezone = "{{$timezone}}"
language = "{{$language}}"
allowed_themes = vier,quattro,duepuntozero,smoothly,frio
theme = vier
allowed_link_protocols[0] = ftp
allowed_link_protocols[1] = ftps
allowed_link_protocols[2] = mailto
allowed_link_protocols[3] = cid
allowed_link_protocols[4] = gopher
maximagesize = 800000
no_regfullname = true
block_local_dir = false
directory = https://dir.friendica.social
auth_cookie_lifetime = 7
INI;
// Keep this line