Remove old config parts

- config.hostname
- system.urlpath
- system.ssl_policy

diff --git a/config/local-sample.config.php b/config/local-sample.config.php
index 2e9c02b421893e6579ef98aa6ae6ad2b285d529f..069e5834f3925ad47aa88fb1a767fbb8b50e729e 100644 (file)
--- a/config/local-sample.config.php
+++ b/config/local-sample.config.php
@@ -36,7 +36,6 @@ return [
                'sitename' => 'Friendica Social Network',
                'register_policy' => \Friendica\Module\Register::OPEN,
                'register_text' => '',
-               'hostname' => 'friendica.local',
        ],
        'system' => [
                'default_timezone' => 'UTC',

diff --git a/database.sql b/database.sql
index e890d7421a232e9ab313b1e272f3d50208d5943d..053f0c7279b6ad1a8116517728d569cd7b95af0d 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2023.03-dev (Giant Rhubarb)
--- DB_UPDATE_VERSION 1514
+-- DB_UPDATE_VERSION 1515
 -- ------------------------------------------
 
 

diff --git a/mods/local.config.ci.php b/mods/local.config.ci.php
index 66e80a80978ca59afc3afebde311a67e66a42019..2da6b2a1ab75c2a8375f31257ce792c45d1201e4 100644 (file)
--- a/mods/local.config.ci.php
+++ b/mods/local.config.ci.php
@@ -35,7 +35,6 @@ return [
        // ****************************************************************
 
        'config' => [
-               'hostname' => 'friendica.local',
                'admin_email' => 'admin@friendica.local',
                'sitename' => 'Friendica Social Network',
                'register_policy' => \Friendica\Module\Register::OPEN,
@@ -44,9 +43,7 @@ return [
        'system' => [
                'default_timezone' => 'UTC',
                'language' => 'en',
-               'ssl_policy' => \Friendica\App\BaseURL::SSL_POLICY_SELFSIGN,
                'url' => 'https://friendica.local',
-               'urlpath' => '',
                // don't start unexpected worker.php processes during test!
                'worker_dont_fork' => true,
        ],

diff --git a/mods/local.config.vagrant.php b/mods/local.config.vagrant.php
index 379ddf185da6f433c89a2379979484a1362a3bda..16426f932deb6abcbc7a49e3a22b77d561ccea0f 100644 (file)
--- a/mods/local.config.vagrant.php
+++ b/mods/local.config.vagrant.php
@@ -29,7 +29,6 @@ return [
        // ****************************************************************
 
        'config' => [
-               'hostname' => '192.168.56.10',
                'admin_email' => 'admin@friendica.local',
                'sitename' => 'Friendica Social Network',
                'register_policy' => \Friendica\Module\Register::OPEN,
@@ -39,8 +38,6 @@ return [
                'default_timezone' => 'UTC',
                'language' => 'en',
                'basepath' => '/vagrant',
-               'ssl_policy' => \Friendica\App\BaseURL::SSL_POLICY_SELFSIGN,
                'url' => 'https://192.168.56.10',
-               'urlpath' => '',
        ],
 ];

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index dcab1d0c8720095d28bc72be089b7dd25ad19b01..83c890915df78719f97a901c730b058fc1552479 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1514);
+       define('DB_UPDATE_VERSION', 1515);
 }
 
 return [

diff --git a/update.php b/update.php
index 86735f864c0e8b2a9d146a95e79529aa14385b40..63afae8d835b1a5466c30551c93e8e146a5acfbf 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1287,3 +1287,15 @@ function update_1514()
 
        return Update::SUCCESS;
 }
+
+function update_1515()
+{
+       DI::config()
+         ->beginTransaction()
+         ->delete('config', 'hostname')
+         ->delete('system', 'urlpath')
+         ->delete('system', 'ssl_policy')
+         ->commit();
+
+       return Update::SUCCESS;
+}