archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

LetsEncrypt fixes

Browse Source 
- Changed virtual host weight for the letsencrypt docker so that it is
  higher than any other weight
- Copy the renewal script to the server (previously it was available
  to the host at /data/git/blender-cloud/…, but no longer.
This commit is contained in:
Sybren A. Stüvel
2018-02-02 12:39:07 +01:00
parent 3be926b9b3
commit 5a3a7a3883
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/2server.sh
View File

@@ -48,7 +48,9 @@ read dummy
echo "===================================================================" echo "==================================================================="
echo "Bringing remote Docker up to date…" echo "Bringing remote Docker up to date…"
$SSH mkdir -p $REMOTE_DOCKER_COMPOSE_DIR $SSH mkdir -p $REMOTE_DOCKER_COMPOSE_DIR
$SCP $DOCKER_DEPLOYDIR/$PROJECT_NAME/docker/docker-compose.yml $DEPLOYHOST:$REMOTE_DOCKER_COMPOSE_DIR $SCP \
$DOCKER_DEPLOYDIR/$PROJECT_NAME/docker/{docker-compose.yml,renew-letsencrypt.sh} \
$DEPLOYHOST:$REMOTE_DOCKER_COMPOSE_DIR
$SSH -T <<EOT $SSH -T <<EOT
set -e set -e
cd $REMOTE_DOCKER_COMPOSE_DIR cd $REMOTE_DOCKER_COMPOSE_DIR

2
docker/docker-compose.yml
View File

@@ -164,7 +164,7 @@ services:
WEBROOT: /data/letsencrypt WEBROOT: /data/letsencrypt
LISTEN: '[::]:80' LISTEN: '[::]:80'
VIRTUAL_HOST: http://cloud.blender.org/.well-known/*, http://stats.cloud.blender.org/.well-known/* VIRTUAL_HOST: http://cloud.blender.org/.well-known/*, http://stats.cloud.blender.org/.well-known/*
VIRTUAL_HOST_WEIGHT: 20 VIRTUAL_HOST_WEIGHT: 30
volumes: volumes:
- /data/letsencrypt:/data/letsencrypt - /data/letsencrypt:/data/letsencrypt