clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove old config parts 

- config.hostname
- system.urlpath
- system.ssl_policy
This commit is contained in:
Philipp 2023-02-18 20:28:01 +01:00
parent 45749c14be
commit 96e12be26b
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/local-sample.config.php
View File

@ -36,7 +36,6 @@ return [
'sitename' => 'Friendica Social Network', 'sitename' => 'Friendica Social Network',
'register_policy' => \Friendica\Module\Register::OPEN, 'register_policy' => \Friendica\Module\Register::OPEN,
'register_text' => '', 'register_text' => '',
'hostname' => 'friendica.local',
], ],
'system' => [ 'system' => [
'default_timezone' => 'UTC', 'default_timezone' => 'UTC',

2
database.sql
View File

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2023.03-dev (Giant Rhubarb) -- Friendica 2023.03-dev (Giant Rhubarb)
-- DB_UPDATE_VERSION 1514 -- DB_UPDATE_VERSION 1515
-- ------------------------------------------ -- ------------------------------------------

3
mods/local.config.ci.php
View File

@ -35,7 +35,6 @@ return [
// **************************************************************** // ****************************************************************
'config' => [ 'config' => [
'hostname' => 'friendica.local',
'admin_email' => 'admin@friendica.local', 'admin_email' => 'admin@friendica.local',
'sitename' => 'Friendica Social Network', 'sitename' => 'Friendica Social Network',
'register_policy' => \Friendica\Module\Register::OPEN, 'register_policy' => \Friendica\Module\Register::OPEN,
@ -44,9 +43,7 @@ return [
'system' => [ 'system' => [
'default_timezone' => 'UTC', 'default_timezone' => 'UTC',
'language' => 'en', 'language' => 'en',
'ssl_policy' => \Friendica\App\BaseURL::SSL_POLICY_SELFSIGN,
'url' => 'https://friendica.local', 'url' => 'https://friendica.local',
'urlpath' => '',
// don't start unexpected worker.php processes during test! // don't start unexpected worker.php processes during test!
'worker_dont_fork' => true, 'worker_dont_fork' => true,
], ],

3
mods/local.config.vagrant.php
View File

@ -29,7 +29,6 @@ return [
// **************************************************************** // ****************************************************************
'config' => [ 'config' => [
'hostname' => '192.168.56.10',
'admin_email' => 'admin@friendica.local', 'admin_email' => 'admin@friendica.local',
'sitename' => 'Friendica Social Network', 'sitename' => 'Friendica Social Network',
'register_policy' => \Friendica\Module\Register::OPEN, 'register_policy' => \Friendica\Module\Register::OPEN,
@ -39,8 +38,6 @@ return [
'default_timezone' => 'UTC', 'default_timezone' => 'UTC',
'language' => 'en', 'language' => 'en',
'basepath' => '/vagrant', 'basepath' => '/vagrant',
'ssl_policy' => \Friendica\App\BaseURL::SSL_POLICY_SELFSIGN,
'url' => 'https://192.168.56.10', 'url' => 'https://192.168.56.10',
'urlpath' => '',
], ],
]; ];

2
static/dbstructure.config.php
View File

@ -55,7 +55,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1514); define('DB_UPDATE_VERSION', 1515);
} }
return [ return [

12
update.php
View File

@ -1287,3 +1287,15 @@ function update_1514()
return Update::SUCCESS; return Update::SUCCESS;
} }
function update_1515()
{
DI::config()
->beginTransaction()
->delete('config', 'hostname')
->delete('system', 'urlpath')
->delete('system', 'ssl_policy')
->commit();
return Update::SUCCESS;
}