faas-rs/faas
1
0
Fork 0
mirror of https://github.com/openfaas/faas.git synced 2025-06-10 09:16:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update default secret mount path to /run/secrets/

Browse Source 
This commit reverts the changes done in #738 to update the default
secret mount path to `/run/secrets/`

Signed-off-by: Vivek Singh <vivekkmr45@yahoo.in>
This commit is contained in:
Vivek Singh 2018-07-02 00:37:58 +05:30 committed by Alex Ellis
parent 49cc6ae727
commit e55c018c17
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.armhf.yml
View File

@ -16,7 +16,7 @@ services:
direct_functions: "true" # Functions are invoked directly over the overlay network
direct_functions_suffix: ""
basic_auth: "false"
secret_mount_path: "/var/openfaas/secrets/"
secret_mount_path: "/run/secrets/"
deploy:
resources:
# limits: # uncomment to enable limits

2
gateway/README.md
View File

@ -55,4 +55,4 @@ The gateway can be configured through the following environment variables:
| `direct_functions` | `true` or `false` - functions are invoked directly over overlay network without passing through provider |
| `direct_functions_suffix` | Provide a DNS suffix for invoking functions directly over overlay network |
| `basic_auth` | Set to `true` or `false` to enable embedded basic auth on the /system and /ui endpoints (recommended) |
| `secret_mount_path` | Set a location where you have mounted `basic-auth-user` and `basic-auth-password`, default: `/var/openfaas/secrets/`. |
| `secret_mount_path` | Set a location where you have mounted `basic-auth-user` and `basic-auth-password`, default: `/run/secrets/`. |

2
gateway/types/readconfig.go
View File

@ -109,7 +109,7 @@ func (ReadConfig) Read(hasEnv HasEnv) GatewayConfig {
secretPath := hasEnv.Getenv("secret_mount_path")
if len(secretPath) == 0 {
secretPath = "/var/openfaas/secrets/"
secretPath = "/run/secrets/"
}
cfg.SecretMountPath = secretPath

2
gateway/types/readconfig_test.go
View File

@ -210,7 +210,7 @@ func TestRead_BasicAuthDefaults(t *testing.T) {
t.Fail()
}
wantSecretsMount := "/var/openfaas/secrets/"
wantSecretsMount := "/run/secrets/"
if config.SecretMountPath != wantSecretsMount {
t.Logf("config.SecretMountPath, want: %s, got: %s\n", wantSecretsMount, config.SecretMountPath)
t.Fail()