Remove in-db configuration references from 1.1

It's still too unstable to be used.

2 files changed, 2 insertions, 23 deletions

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 462940e7e..d29dda852 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -3,22 +3,11 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Mix.Tasks.Pleroma.Config do
+  @doc false
   use Mix.Task
   import Mix.Pleroma
   alias Pleroma.Repo
   alias Pleroma.Web.AdminAPI.Config
-  @shortdoc "Manages the location of the config"
-  @moduledoc """
-  Manages the location of the config.
-
-  ## Transfers config from file to DB.
-
-      mix pleroma.config migrate_to_db
-
-  ## Transfers config from DB to file `config/env.exported_from_db.secret.exs`
-
-      mix pleroma.config migrate_from_db ENV
-  """
 
   def run(["migrate_to_db"]) do
     start_pleroma()
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index b9b1991c2..4d90942c1 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -31,7 +31,6 @@ defmodule Mix.Tasks.Pleroma.Instance do
   - `--dbpass DBPASS` - the password to use for the database connection
   - `--rum Y/N` - Whether to enable RUM indexes
   - `--indexable Y/N` - Allow/disallow indexing site by search engines
-  - `--db-configurable Y/N` - Allow/disallow configuring instance from admin part
   - `--uploads-dir` - the directory uploads go in when using a local uploader
   - `--static-dir` - the directory custom public files should be read from (custom emojis, frontend bundle overrides, robots.txt, etc.)
   - `--listen-ip` - the ip the app should listen to, defaults to 127.0.0.1
@@ -56,7 +55,6 @@ defmodule Mix.Tasks.Pleroma.Instance do
           dbpass: :string,
           rum: :string,
           indexable: :string,
-          db_configurable: :string,
           uploads_dir: :string,
           static_dir: :string,
           listen_ip: :string,
@@ -113,14 +111,6 @@ defmodule Mix.Tasks.Pleroma.Instance do
           "y"
         ) === "y"
 
-      db_configurable? =
-        get_option(
-          options,
-          :db_configurable,
-          "Do you want to store the configuration in the database (allows controlling it from admin-fe)? (y/n)",
-          "n"
-        ) === "y"
-
       dbhost = get_option(options, :dbhost, "What is the hostname of your database?", "localhost")
 
       dbname = get_option(options, :dbname, "What is the name of your database?", "pleroma")
@@ -205,7 +195,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
           signing_salt: signing_salt,
           web_push_public_key: Base.url_encode64(web_push_public_key, padding: false),
           web_push_private_key: Base.url_encode64(web_push_private_key, padding: false),
-          db_configurable?: db_configurable?,
+          db_configurable?: false,
           static_dir: static_dir,
           uploads_dir: uploads_dir,
           rum_enabled: rum_enabled,