diff --git a/README.md b/README.md index be7a82c..c40fdf4 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ docker run \ ## Authentication -Currently HTTP basic auth is optionally supported. To use it, set the `AUTH_USERNAME` and `AUTH_PASSWORD` environment variables when starting the container. If you don't set both of these, no authentication will be required. +Currently HTTP basic auth is optionally supported. To use it, set the `BASIC_AUTH_USERNAME` and `BASIC_AUTH_PASSWORD` environment variables when starting the container. If you don't set both of these, no authentication will be required. ## License diff --git a/config/config.exs b/config/config.exs index 617613b..4718265 100644 --- a/config/config.exs +++ b/config/config.exs @@ -17,10 +17,10 @@ config :pinchflat, # The user may or may not store metadata for their needs, but the app will always store its copy metadata_directory: "/config/metadata", tmpfile_directory: Path.join([System.tmp_dir!(), "pinchflat", "data"]), - # Setting AUTH_USERNAME and AUTH_PASSWORD implies you want to use basic auth. + # Setting BASIC_AUTH_USERNAME and BASIC_AUTH_PASSWORD implies you want to use basic auth. # If either is unset, basic auth will not be used. - basic_auth_username: System.get_env("AUTH_USERNAME"), - basic_auth_password: System.get_env("AUTH_PASSWORD"), + basic_auth_username: System.get_env("BASIC_AUTH_USERNAME"), + basic_auth_password: System.get_env("BASIC_AUTH_PASSWORD"), file_watcher_poll_interval: 1000 # Configures the endpoint diff --git a/config/runtime.exs b/config/runtime.exs index 8fb0033..e151336 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -21,6 +21,10 @@ if System.get_env("PHX_SERVER") do config :pinchflat, PinchflatWeb.Endpoint, server: true end +config :pinchflat, + basic_auth_username: System.get_env("BASIC_AUTH_USERNAME"), + basic_auth_password: System.get_env("BASIC_AUTH_PASSWORD") + if config_env() == :prod do config_path = System.get_env("CONFIG_PATH") ||