Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
fe40f6f2
Commit
fe40f6f2
authored
May 20, 2021
by
feld
Browse files
Switch from the deprecated "use Mix.config" to "import Config"
parent
8e9f032f
Pipeline
#36096
passed with stages
in 6 minutes and 43 seconds
Changes
10
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
config/benchmark.exs
View file @
fe40f6f2
use
Mix
.
Config
import
Config
# We don't run a server during test. If one is required,
# you can enable the server option below.
...
...
config/config.exs
View file @
fe40f6f2
...
...
@@ -41,7 +41,7 @@
#
# This configuration file is loaded before any dependency and
# is restricted to this project.
use
Mix
.
Config
import
Config
# General application configuration
config
:pleroma
,
ecto_repos:
[
Pleroma
.
Repo
]
...
...
config/description.exs
View file @
fe40f6f2
use
Mix
.
Config
import
Config
websocket_config
=
[
path:
"/websocket"
,
...
...
config/dev.exs
View file @
fe40f6f2
use
Mix
.
Config
import
Config
# For development, we disable any cache and enable
# debugging and code reloading.
...
...
config/dokku.exs
View file @
fe40f6f2
use
Mix
.
Config
import
Config
config
:pleroma
,
Pleroma
.
Web
.
Endpoint
,
http:
[
...
...
config/prod.exs
View file @
fe40f6f2
use
Mix
.
Config
import
Config
# For production, we often load configuration from external
# sources, such as your system environment. For this reason,
...
...
config/test.exs
View file @
fe40f6f2
use
Mix
.
Config
import
Config
# We don't run a server during test. If one is required,
# you can enable the server option below.
...
...
test/fixtures/config/temp.exported_from_db.secret.exs
View file @
fe40f6f2
use
Mix
.
Config
import
Config
config
:pleroma
,
exported_config_merged:
true
...
...
test/fixtures/config/temp.secret.exs
View file @
fe40f6f2
...
...
@@ -2,7 +2,7 @@
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
use
Mix
.
Config
import
Config
config
:pleroma
,
:first_setting
,
key:
"value"
,
key2:
[
Pleroma
.
Repo
]
...
...
test/mix/tasks/pleroma/config_test.exs
View file @
fe40f6f2
...
...
@@ -188,15 +188,8 @@ test "load a settings with large values and pass to file", %{temp_file: temp_fil
assert
File
.
exists?
(
temp_file
)
{
:ok
,
file
}
=
File
.
read
(
temp_file
)
header
=
if
Code
.
ensure_loaded?
(
Config
.
Reader
)
do
"import Config"
else
"use Mix.Config"
end
assert
file
==
"
#{
header
}
\n\n
config :pleroma, :instance,
\n
name:
\"
Pleroma
\"
,
\n
email:
\"
example@example.com
\"
,
\n
notify_email:
\"
noreply@example.com
\"
,
\n
description:
\"
A Pleroma instance, an alternative fediverse server
\"
,
\n
limit: 5000,
\n
chat_limit: 5000,
\n
remote_limit: 100_000,
\n
upload_limit: 16_000_000,
\n
avatar_upload_limit: 2_000_000,
\n
background_upload_limit: 4_000_000,
\n
banner_upload_limit: 4_000_000,
\n
poll_limits: %{
\n
max_expiration: 31_536_000,
\n
max_option_chars: 200,
\n
max_options: 20,
\n
min_expiration: 0
\n
},
\n
registrations_open: true,
\n
federating: true,
\n
federation_incoming_replies_max_depth: 100,
\n
federation_reachability_timeout_days: 7,
\n
federation_publisher_modules: [Pleroma.Web.ActivityPub.Publisher],
\n
allow_relay: true,
\n
public: true,
\n
quarantined_instances: [],
\n
managed_config: true,
\n
static_dir:
\"
instance/static/
\"
,
\n
allowed_post_formats: [
\"
text/plain
\"
,
\"
text/html
\"
,
\"
text/markdown
\"
,
\"
text/bbcode
\"
],
\n
autofollowed_nicknames: [],
\n
max_pinned_statuses: 1,
\n
attachment_links: false,
\n
max_report_comment_size: 1000,
\n
safe_dm_mentions: false,
\n
healthcheck: false,
\n
remote_post_retention_days: 90,
\n
skip_thread_containment: true,
\n
limit_to_local_content: :unauthenticated,
\n
user_bio_length: 5000,
\n
user_name_length: 100,
\n
max_account_fields: 10,
\n
max_remote_account_fields: 20,
\n
account_field_name_length: 512,
\n
account_field_value_length: 2048,
\n
external_user_synchronization: true,
\n
extended_nickname_format: true,
\n
multi_factor_authentication: [
\n
totp: [digits: 6, period: 30],
\n
backup_codes: [number: 2, length: 6]
\n
]
\n
"
"
import Config
\n\n
config :pleroma, :instance,
\n
name:
\"
Pleroma
\"
,
\n
email:
\"
example@example.com
\"
,
\n
notify_email:
\"
noreply@example.com
\"
,
\n
description:
\"
A Pleroma instance, an alternative fediverse server
\"
,
\n
limit: 5000,
\n
chat_limit: 5000,
\n
remote_limit: 100_000,
\n
upload_limit: 16_000_000,
\n
avatar_upload_limit: 2_000_000,
\n
background_upload_limit: 4_000_000,
\n
banner_upload_limit: 4_000_000,
\n
poll_limits: %{
\n
max_expiration: 31_536_000,
\n
max_option_chars: 200,
\n
max_options: 20,
\n
min_expiration: 0
\n
},
\n
registrations_open: true,
\n
federating: true,
\n
federation_incoming_replies_max_depth: 100,
\n
federation_reachability_timeout_days: 7,
\n
federation_publisher_modules: [Pleroma.Web.ActivityPub.Publisher],
\n
allow_relay: true,
\n
public: true,
\n
quarantined_instances: [],
\n
managed_config: true,
\n
static_dir:
\"
instance/static/
\"
,
\n
allowed_post_formats: [
\"
text/plain
\"
,
\"
text/html
\"
,
\"
text/markdown
\"
,
\"
text/bbcode
\"
],
\n
autofollowed_nicknames: [],
\n
max_pinned_statuses: 1,
\n
attachment_links: false,
\n
max_report_comment_size: 1000,
\n
safe_dm_mentions: false,
\n
healthcheck: false,
\n
remote_post_retention_days: 90,
\n
skip_thread_containment: true,
\n
limit_to_local_content: :unauthenticated,
\n
user_bio_length: 5000,
\n
user_name_length: 100,
\n
max_account_fields: 10,
\n
max_remote_account_fields: 20,
\n
account_field_name_length: 512,
\n
account_field_value_length: 2048,
\n
external_user_synchronization: true,
\n
extended_nickname_format: true,
\n
multi_factor_authentication: [
\n
totp: [digits: 6, period: 30],
\n
backup_codes: [number: 2, length: 6]
\n
]
\n
"
end
end
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment