Merge pull request #28 from opendatakit/cxlt/25-2

bug #25: second attempt to deal with nginx boot problems.
getodk · Oct 23, 2018 · f3a0d90 · f3a0d90
2 parents 4334705 + 4a18563
commit f3a0d90
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/files/nginx/odk-setup.sh b/files/nginx/odk-setup.sh
@@ -20,5 +20,10 @@ fi
 echo "writing a new nginx configuration file.."
 /bin/bash -c "envsubst '\$SSL_TYPE \$DOMAIN' < /usr/share/nginx/odk.conf.template > /etc/nginx/conf.d/odk.conf"
 
-/bin/bash /scripts/entrypoint.sh
+if [ "$SSL_TYPE" = "letsencrypt" ]
+then
+  /bin/bash /scripts/entrypoint.sh
+else
+  nginx -g "daemon off;"
+fi