Merge pull request #310 from getodk/release

Release v1.5.3

enketo.dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/enketo/enketo-express:4.1.1
+FROM ghcr.io/enketo/enketo-express:4.1.2
 
 ENV ENKETO_SRC_DIR=/srv/src/enketo_express
 WORKDIR ${ENKETO_SRC_DIR}

files/enketo/config.json.template

@@ -11,7 +11,7 @@
             "url": "https://${DOMAIN}:${HTTPS_PORT}/#/login?next={RETURNURL}"
         },
         "name": "ODK Central",
-        "server url": ""
+        "server url": "${DOMAIN}"
     },
     "logo": {
         "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=",

files/nginx/common-headers.nginx.conf

@@ -0,0 +1,8 @@
+# This file should be included in server{}, and also in any location{}
+# which has a call to add_header.
+# See: https://nginx.org/en/docs/http/ngx_http_headers_module.html#add_header
+
+add_header Referrer-Policy same-origin;
+add_header Strict-Transport-Security "max-age=63072000" always;
+add_header X-Frame-Options "SAMEORIGIN";
+add_header X-Content-Type-Options nosniff;

files/nginx/odk.conf.template

@@ -13,10 +13,8 @@ server {
   ssl_dhparam /etc/dh/nginx.pem;
 
   server_tokens off;
-  add_header Strict-Transport-Security "max-age=63072000" always;
 
-  add_header X-Frame-Options "SAMEORIGIN";
-  add_header X-Content-Type-Options nosniff;
+  include /usr/share/nginx/common-headers.nginx.conf;
 
   client_max_body_size 100m;
 
@@ -52,9 +50,11 @@ server {
     root /usr/share/nginx/html;
 
     location /version.txt {
+      include /usr/share/nginx/common-headers.nginx.conf;
       add_header Cache-Control no-cache;
     }
     location /index.html {
+      include /usr/share/nginx/common-headers.nginx.conf;
       add_header Cache-Control no-cache;
     }
   }

files/service/config.json.template

@@ -28,6 +28,7 @@
     },
     "external": {
       "sentry": {
+        "orgSubdomain": "o130137",
         "key": "3cf75f54983e473da6bd07daddf0d2ee",
         "project": "1298632"
       }

nginx.dockerfile

@@ -23,6 +23,7 @@ COPY files/local/customssl/*.pem /etc/customssl/live/local/
 COPY files/nginx/default /etc/nginx/sites-enabled/
 COPY files/nginx/inflate_body.lua /usr/share/nginx/
 COPY files/nginx/odk.conf.template /usr/share/nginx/
+COPY files/nginx/common-headers.nginx.conf /usr/share/nginx/
 COPY files/nginx/certbot.conf /usr/share/nginx/
 COPY files/nginx/redirector.conf /usr/share/nginx/
 COPY --from=intermediate client/dist/ /usr/share/nginx/html/