Skip to content

Commit

Permalink
Revert "allow HAPROXY_PASSWORD to be a path to a Docker secret - reso…
Browse files Browse the repository at this point in the history
…lve if so"

This reverts commit e8becef.
  • Loading branch information
dtenenba committed Oct 20, 2021
1 parent e8becef commit 21f723c
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions assets/scripts/swarm.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@
}

if os.getenv("HAPROXY_PASSWORD"):
password = os.getenv("HAPROXY_PASSWORD")
if password.startswith("/run/secrets/"): # support docker secrets
with open(password) as passfh:
password = passfh.read().strip()
result["stats"] = {
"username": os.getenv("HAPROXY_USERNAME") if os.getenv("HAPROXY_USERNAME") else "admin",
"password": password,
"password": os.getenv("HAPROXY_PASSWORD"),
"port": os.getenv("HAPROXY_STATS_PORT") if os.getenv("HAPROXY_STATS_PORT") else "1936",
}

Expand Down

0 comments on commit 21f723c

Please sign in to comment.