Skip to content

Commit f81c67f

Browse files
committed
fix(confd): Fix user registration disabling
1 parent 32761c9 commit f81c67f

3 files changed

Lines changed: 3 additions & 8 deletions

File tree

rootfs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RUN apk add --update-cache curl bash openssl sudo && rm -rf /var/cache/apk/*
55

66
# install etcdctl and confd
77
RUN apk add --update-cache curl tar \
8-
&& curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.10.0/confd-0.10.0-linux-amd64 \
8+
&& curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.12.0-alpha3/confd-0.12.0-alpha3-linux-amd64 \
99
&& chmod +x /usr/local/bin/confd \
1010
&& apk del --purge curl tar \
1111
&& rm -rf /var/cache/apk/*

rootfs/conf.d/local_settings.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ uid = 1000
55
gid = 1000
66
mode = "0640"
77
keys = [
8-
"/deis/controller",
9-
"/deis/platform",
8+
"/deis/controller"
109
]
1110
reload_cmd = "/app/bin/reload"

rootfs/templates/local_settings.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717

1818
DATABASES['default']['NAME'] = DATABASES['default']['USER']
1919

20-
{{ if exists "/deis/controller/registrationMode" }}
21-
REGISTRATION_MODE = '{{ getv "/deis/controller/registrationMode" }}'
22-
{{ else }}
23-
REGISTRATION_MODE = 'enabled'
24-
{{ end }}
20+
REGISTRATION_MODE = '{{ getv "/deis/controller/registration/mode" "enabled" }}'
2521

2622
{{ if exists "/deis/controller/subdomain" }}
2723
DEIS_RESERVED_NAMES = ['{{ getv "/deis/controller/subdomain" }}']

0 commit comments

Comments
 (0)