Include ca-certificates, change path for pwned

3 files changed, 3 insertions, 3 deletions

diff --git a/Dockerfile b/Dockerfile
index 6e756bd..26804f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o pwman .
 #RUN apk --no-cache add ca-certificates
 FROM ubuntu:18.04
 RUN apt-get update && \
-    apt-get install -y libheimdal-kadm5-perl
+    apt-get install -y libheimdal-kadm5-perl ca-certificates
 WORKDIR /opt
 COPY --from=build /go/src/pwman/pwman /usr/local/bin/
 COPY krb5.conf /etc/krb5.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index a5d5b96..5f5ee06 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,5 +52,5 @@ services:
       - ./data/keytabs:/opt/keytabs
       - ./data/pwman:/opt/pwman
       - ./data/pwman/krb5.conf:/etc/krb5.conf:ro
-      - /Users/markus/Downloads/pwned-passwords-ordered-v3-shaonly.txt:/opt/pwned-passwords-ordered-2.0.txt:ro
+      - /Users/markus/Downloads/pwned-passwords-ordered-v3-shaonly.txt:/opt/pwned/pwned-passwords-ordered.txt:ro
         #- ./data/pwman/pwned-passwords-ordered-v3.txt:/opt/pwned-passwords-ordered-2.0.txt:ro
diff --git a/main.go b/main.go
index 96eb974..962c624 100644
--- a/main.go
+++ b/main.go
@@ -33,7 +33,7 @@ func main() {
 	flag.BoolVar(&ldapSkipSSLVerify, "ldap-ssl-skip-verify", false, "Should the ssl certificate of the ldap server be verfied")
 	flag.StringVar(&ldapUser, "ldap-user", "cn=admin,dc=nordu,dc=net", "An ldap user that can change user attributes")
 	flag.StringVar(&ldapPassword, "ldap-password", "", "Ldap user password")
-	flag.StringVar(&pwnedFile, "pwned", "./pwned-passwords-ordered-2.0.txt", "Path to the pwned passwords list")
+	flag.StringVar(&pwnedFile, "pwned", "./pwned/pwned-passwords-ordered.txt", "Path to the pwned passwords list")
 	flag.StringVar(&krb5Conf, "krb5-config", "./krb5.conf", "Path to kerberos config file")
 	flag.StringVar(&changePwScript, "changepw-script", "./scripts/create-kdc-principal.pl", "Path to the change password script")
 	flag.StringVar(&csrfSecret, "csrf-secret", "", "Specify csrf 32 char secret")