From a89ed5d85bd9682d29d74ee5985a435c1679ac25 Mon Sep 17 00:00:00 2001 From: Viktor Roytman Date: Tue, 6 Dec 2016 14:27:28 -0500 Subject: [PATCH] Squashed commit of the following: commit d0041884946ee67610a436b83461edae2a25d072 Author: Viktor Roytman Date: Tue Dec 6 14:27:11 2016 -0500 Update version to 0.0.6 commit 5d223f7d2a7f0e5f4d7b8dfde8208522e8cb34e6 Author: Viktor Roytman Date: Tue Dec 6 14:25:58 2016 -0500 Update cron command --- prod/docker-compose.yml | 2 +- prod/install.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/prod/docker-compose.yml b/prod/docker-compose.yml index 8aef949..a1d0a43 100644 --- a/prod/docker-compose.yml +++ b/prod/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: minigrid: - image: selcolumbia/minigrid-server:0.0.5 + image: selcolumbia/minigrid-server:0.0.6 command: ./prod/run.sh --db_host=db --redis_url=redis://redis:6379/0 --minigrid-website-url=https://www.example.com depends_on: - redis diff --git a/prod/install.sh b/prod/install.sh index d655f5c..ee24d9f 100755 --- a/prod/install.sh +++ b/prod/install.sh @@ -1,5 +1,5 @@ #!/usr/bin/env sh -# Minigrid Server installer for version 0.0.5 +# Minigrid Server installer for version 0.0.6 set -e # Do you have docker installed? @@ -108,8 +108,8 @@ $SUDO openssl dhparam -out /etc/letsencrypt/live/$LETSENCRYPT_DIR/dhparam.pem 20 printf "========================================\n" printf " Downloading configuration files \n" printf "========================================\n" -$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.5/prod/docker-compose.yml > docker-compose.yml -$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.5/prod/nginx.conf > nginx.conf +$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.6/prod/docker-compose.yml > docker-compose.yml +$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.6/prod/nginx.conf > nginx.conf sed -i s/www.example.com/$LETSENCRYPT_DIR/g docker-compose.yml sed -i s/www.example.com/$LETSENCRYPT_DIR/g nginx.conf @@ -142,7 +142,7 @@ CRON_CMD="mkdir -p /tmp/letsencrypt && "\ " -v /var/lib/letsencrypt:/var/lib/letsencrypt:Z"\ " -v /tmp:/tmp:Z"\ " -v /var/log/letsencrypt:/var/log/letsencrypt:Z"\ -" quay.io/letsencrypt/letsencrypt renew --quiet --post-hook 'touch /tmp/renewed' ; "\ +" quay.io/letsencrypt/letsencrypt renew --quiet --webroot-path /tmp/letsencrypt --post-hook 'touch /tmp/renewed' ; "\ "if [ -f /tmp/renewed ] ; then docker restart $NGINX_CONTAINER_NAME ; fi ; "\ "rm -f /tmp/renewed" # https://certbot.eff.org/#ubuntuxenial-nginx recommends running this twice a day on random minute within the hour