From 5a3a7a3883d398224adc9dcf87947f6a2bb77462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 2 Feb 2018 12:39:07 +0100
Subject: [PATCH] LetsEncrypt fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 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.
---
 deploy/2server.sh         | 4 +++-
 docker/docker-compose.yml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/deploy/2server.sh b/deploy/2server.sh
index 3fa04b4..bedbf4d 100755
--- a/deploy/2server.sh
+++ b/deploy/2server.sh
@@ -48,7 +48,9 @@ read dummy
 echo "==================================================================="
 echo "Bringing remote Docker up to date…"
 $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
 set -e
 cd $REMOTE_DOCKER_COMPOSE_DIR
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 17055a6..7382f74 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -164,7 +164,7 @@ services:
       WEBROOT:               /data/letsencrypt
       LISTEN:                '[::]:80'
       VIRTUAL_HOST:          http://cloud.blender.org/.well-known/*, http://stats.cloud.blender.org/.well-known/*
-      VIRTUAL_HOST_WEIGHT:   20
+      VIRTUAL_HOST_WEIGHT:   30
     volumes:
       - /data/letsencrypt:/data/letsencrypt