diff options
| author | feld <feld@feld.me> | 2021-01-26 18:14:01 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-01-26 18:14:01 +0000 |
| commit | d7af0294e6a3a690524e0a08a35c9c6dafbb9f79 (patch) | |
| tree | 2efd6fa44d20f0251b9776f861722d83bb04e4b6 /config | |
| parent | e1eac4faac723c5015d7d696600d24c44f5ab52c (diff) | |
| parent | 7fcaa188a0be4bc8e41790ddda9b6789cb318347 (diff) | |
| download | pleroma-d7af0294e6a3a690524e0a08a35c9c6dafbb9f79.tar.gz pleroma-d7af0294e6a3a690524e0a08a35c9c6dafbb9f79.zip | |
Merge branch 'service-worker-allowed-header' into 'develop'
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 5eca250bb..b9af250c5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -725,7 +725,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..fac5a006e 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" } ] |