Skip to content

Commit 58b6c2b

Browse files
committed
Squashed commit of the following:
commit 9f3f2b5cfb8dc6f85e41a6f67f8c48ed290c3bc3 Author: Viktor Roytman <vr2262@columbia.edu> Date: Tue Dec 6 13:37:26 2016 -0500 Update version to 0.0.5 commit 339ae3fa68e62de06f163f88f3771fba3c405b69 Author: Viktor Roytman <vr2262@columbia.edu> Date: Tue Dec 6 13:36:50 2016 -0500 Update cron command
1 parent b0b320f commit 58b6c2b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

prod/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
minigrid:
4-
image: selcolumbia/minigrid-server:0.0.4
4+
image: selcolumbia/minigrid-server:0.0.5
55
command: ./prod/run.sh --db_host=db --redis_url=redis://redis:6379/0 --minigrid-website-url=https://www.example.com
66
depends_on:
77
- redis

prod/install.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env sh
2-
# Minigrid Server installer for version 0.0.4
2+
# Minigrid Server installer for version 0.0.5
33
set -e
44

55
# Do you have docker installed?
@@ -108,8 +108,8 @@ $SUDO openssl dhparam -out /etc/letsencrypt/live/$LETSENCRYPT_DIR/dhparam.pem 20
108108
printf "========================================\n"
109109
printf " Downloading configuration files \n"
110110
printf "========================================\n"
111-
$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.4/prod/docker-compose.yml > docker-compose.yml
112-
$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.4/prod/nginx.conf > nginx.conf
111+
$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.5/prod/docker-compose.yml > docker-compose.yml
112+
$CURL -L https://raw.githubusercontent.com/SEL-Columbia/minigrid-server/0.0.5/prod/nginx.conf > nginx.conf
113113

114114
sed -i s/www.example.com/$LETSENCRYPT_DIR/g docker-compose.yml
115115
sed -i s/www.example.com/$LETSENCRYPT_DIR/g nginx.conf
@@ -146,6 +146,6 @@ CRON_CMD="mkdir -p /tmp/letsencrypt && "\
146146
"if [ -f /tmp/renewed ] ; then docker restart $NGINX_CONTAINER_NAME ; fi ; "\
147147
"rm -f /tmp/renewed"
148148
# https://certbot.eff.org/#ubuntuxenial-nginx recommends running this twice a day on random minute within the hour
149-
CRON_JOB="00 01,13 * * * sleep $(expr $RANDOM \% 59); $CRON_CMD"
149+
CRON_JOB="00 01,13 * * * sleep \$(expr \$RANDOM \% 59); $CRON_CMD"
150150
crontab -l | fgrep -i -v "$CRON_CMD" | { cat; echo "$CRON_JOB"; } | crontab -
151151
crontab -l

0 commit comments

Comments
 (0)