diff options
| author | feld <feld@feld.me> | 2021-02-03 14:23:23 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-02-03 14:23:23 +0000 |
| commit | 008499f65a33f5d42a98cc3719f6ab5e8def40d6 (patch) | |
| tree | 1bcf258f38105267d4f655d8aed68d1ab502523f /config | |
| parent | 39335d42513e47289fc825d04680531b84862686 (diff) | |
| parent | c3dd860a027ef1339285b5b62dc62e0b48bc6855 (diff) | |
| download | pleroma-008499f65a33f5d42a98cc3719f6ab5e8def40d6.tar.gz | |
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 | ||||
| -rw-r--r-- | config/description.exs | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 715524e84..0fbca06f3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -726,7 +726,10 @@ config :pleroma, :frontends, "git" => "https://git.pleroma.social/pleroma/fedi-fe", "build_url" => "https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build", - "ref" => "master" + "ref" => "master", + "custom-http-headers" => [ + {"service-worker-allowed", "/"} + ] }, "admin-fe" => %{ "name" => "admin-fe", diff --git a/config/description.exs b/config/description.exs index d7dc264ee..f84b52a4f 100644 --- a/config/description.exs +++ b/config/description.exs @@ -60,6 +60,12 @@ frontend_options = [ label: "Build directory", type: :string, description: "The directory inside the zip file " + }, + %{ + key: "custom-http-headers", + label: "Custom HTTP headers", + type: {:list, :string}, + description: "The custom HTTP headers for the frontend" } ] @@ -3218,6 +3224,12 @@ config :pleroma, :config_description, [ type: :string, description: "S3 host", suggestions: ["s3.eu-central-1.amazonaws.com"] + }, + %{ + key: :region, + type: :string, + description: "S3 region (for AWS)", + suggestions: ["us-east-1"] } ] }, |