Merge pull request #57 from opendatakit/cxlt/fix-nginx-init

bug: new upstream nginx enables default automatically; don't.
getodk · Feb 18, 2019 · bef73ec · bef73ec
2 parents bcd031a + 7638eca
commit bef73ec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 0 deletions.
diff --git a/files/nginx/default b/files/nginx/default
diff --git a/nginx.dockerfile b/nginx.dockerfile
@@ -22,6 +22,7 @@ COPY files/local/customssl/*.pem /etc/customssl/live/local/
 
 COPY files/nginx/odk.conf.template /usr/share/nginx
 COPY files/nginx/inflate_body.lua /usr/share/nginx
+COPY files/nginx/default /etc/nginx/sites-enabled/
 COPY --from=intermediate client/ /usr/share/nginx/html
 COPY --from=intermediate /tmp/version.txt /usr/share/nginx/html/