aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorKonstantin Lebedev <lebedev_k@tochka.com>2021-03-10 14:02:13 +0500
committerKonstantin Lebedev <lebedev_k@tochka.com>2021-03-10 14:02:13 +0500
commit831953c55c04e8fca50bffd1c45197ea065e6b60 (patch)
tree20a87e6a01a91516d5baa48d645d40f101a644bb /docker
parent4bf93d6e63d6e13355ee1cb989e571c9fc6b3507 (diff)
downloadseaweedfs-831953c55c04e8fca50bffd1c45197ea065e6b60.tar.xz
seaweedfs-831953c55c04e8fca50bffd1c45197ea065e6b60.zip
allowed wildcard domain
Diffstat (limited to 'docker')
-rw-r--r--docker/Makefile16
-rw-r--r--docker/compose/tls.env21
2 files changed, 17 insertions, 20 deletions
diff --git a/docker/Makefile b/docker/Makefile
index c589fea83..345eac272 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -48,11 +48,11 @@ clean:
certstrap:
go get github.com/square/certstrap
certstrap --depot-path compose/tls init --passphrase "" --common-name "SeaweedFS CA" || true
- certstrap --depot-path compose/tls request-cert --passphrase "" --common-name volume01 || true
- certstrap --depot-path compose/tls request-cert --passphrase "" --common-name master01 || true
- certstrap --depot-path compose/tls request-cert --passphrase "" --common-name filer01 || true
- certstrap --depot-path compose/tls request-cert --passphrase "" --common-name client01 || true
- certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" volume01 || true
- certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" master01 || true
- certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" filer01 || true
- certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" client01 || true \ No newline at end of file
+ certstrap --depot-path compose/tls request-cert --passphrase "" --common-name volume01.dev || true
+ certstrap --depot-path compose/tls request-cert --passphrase "" --common-name master01.dev || true
+ certstrap --depot-path compose/tls request-cert --passphrase "" --common-name filer01.dev || true
+ certstrap --depot-path compose/tls request-cert --passphrase "" --common-name client01.dev || true
+ certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" volume01.dev || true
+ certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" master01.dev || true
+ certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" filer01.dev || true
+ certstrap --depot-path compose/tls sign --CA "SeaweedFS CA" client01.dev || true \ No newline at end of file
diff --git a/docker/compose/tls.env b/docker/compose/tls.env
index 126b48e47..e03f42e95 100644
--- a/docker/compose/tls.env
+++ b/docker/compose/tls.env
@@ -1,13 +1,10 @@
WEED_GRPC_CA=/etc/seaweedfs/tls/SeaweedFS_CA.crt
-WEED_GRPC_MASTER_CERT=/etc/seaweedfs/tls/master01.crt
-WEED_GRPC_MASTER_KEY=/etc/seaweedfs/tls/master01.key
-WEED_GRPC_VOLUME_CERT=/etc/seaweedfs/tls/volume01.crt
-WEED_GRPC_VOLUME_KEY=/etc/seaweedfs/tls/volume01.key
-WEED_GRPC_FILER_CERT=/etc/seaweedfs/tls/filer01.crt
-WEED_GRPC_FILER_KEY=/etc/seaweedfs/tls/filer01.key
-WEED_GRPC_CLIENT_CERT=/etc/seaweedfs/tls/client01.crt
-WEED_GRPC_CLIENT_KEY=/etc/seaweedfs/tls/client01.key
-WEED_GRPC_MASTER_ALLOWED_COMMONNAMES="volume01,master01,filer01,client01"
-WEED_GRPC_VOLUME_ALLOWED_COMMONNAMES="volume01,master01,filer01,client01"
-WEED_GRPC_FILER_ALLOWED_COMMONNAMES="volume01,master01,filer01,client01"
-WEED_GRPC_CLIENT_ALLOWED_COMMONNAMES="volume01,master01,filer01,client01" \ No newline at end of file
+WEED_GRPC_ALLOWED_WILDCARD_DOMAIN=".dev"
+WEED_GRPC_MASTER_CERT=/etc/seaweedfs/tls/master01.dev.crt
+WEED_GRPC_MASTER_KEY=/etc/seaweedfs/tls/master01.dev.key
+WEED_GRPC_VOLUME_CERT=/etc/seaweedfs/tls/volume01.dev.crt
+WEED_GRPC_VOLUME_KEY=/etc/seaweedfs/tls/volume01.dev.key
+WEED_GRPC_FILER_CERT=/etc/seaweedfs/tls/filer01.dev.crt
+WEED_GRPC_FILER_KEY=/etc/seaweedfs/tls/filer01.dev.key
+WEED_GRPC_CLIENT_CERT=/etc/seaweedfs/tls/client01.dev.crt
+WEED_GRPC_CLIENT_KEY=/etc/seaweedfs/tls/client01.dev.key \ No newline at end of file