Browse Source

Revert #347 as it caused SSL cert to not be setup properly

Mark Shust 4 năm trước cách đây
mục cha
commit
2602909aee
2 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 1 4
      compose/bin/setup-ssl
  2. 3 0
      compose/bin/setup-ssl-ca

+ 1 - 4
compose/bin/setup-ssl

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

+ 3 - 0
compose/bin/setup-ssl-ca

@@ -1,5 +1,8 @@
 #!/bin/bash
 #!/bin/bash
 
 
+# Generate a new local CA "/root/.local/share/mkcert"
+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 .
 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..."
 echo "System password requested to install certificate authority on host..."