Forráskód Böngészése

Merge pull request #347 from rnicklin/patch-1

mkcert -install is being called in the wrong place
Mark Shust 4 éve
szülő
commit
fffeacf0e1
2 módosított fájl, 5 hozzáadás és 2 törlés
  1. 4 1
      compose/bin/setup-ssl
  2. 1 1
      compose/bin/setup-ssl-ca

+ 4 - 1
compose/bin/setup-ssl

@@ -1,7 +1,10 @@
 #!/bin/bash
 [ -z "$1" ] && echo "Please specify a domain (ex. mydomain.test)" && exit
 
-# Generate certificate authority if not already setup
+# Generate a new local CA "/root/.local/share/mkcert"
+docker-compose exec -T -u root app mkcert -install
+
+# Read the CA install for requested hostname
 if ! docker-compose exec -T -u root app cat /root/.local/share/mkcert/rootCA.pem | grep -q 'BEGIN CERTIFICATE'; then
   bin/setup-ssl-ca
 fi

+ 1 - 1
compose/bin/setup-ssl-ca

@@ -1,5 +1,5 @@
 #!/bin/bash
-docker-compose exec -T -u root app mkcert -install
+
 docker cp $(docker-compose ps -q app|awk '{print $1}'):/root/.local/share/mkcert/rootCA.pem .
 echo "System password requested to install certificate authority on host..."