Merge pull request #97 from UN-OCHA/develop

Deploy 16-04-2024

docker/Dockerfile

@@ -52,11 +52,7 @@ RUN  wget https://get.symfony.com/cli/installer -O - | bash -s -- --install-dir=
      rm -rf /srv/www/html && \
      ln -s /srv/www/public /srv/www/html && \
      mkdir -p /srv/www/var/cache /srv/www/var/log /srv/www/var/sessions /etc/nginx/custom && \
-     chown appuser:appuser /srv/www/var/cache /srv/www/var/log /srv/www/var/sessions && \
-     curl -L -o /tmp/apm-agent-php_all.apk https://github.com/elastic/apm-agent-php/releases/download/v1.10.0/apm-agent-php_1.10.0_all.apk && \
-     apk add --allow-untrusted /tmp/apm-agent-php_all.apk && \
-     rm -f /tmp/apm-agent-php_all.apk && \
-     mv -f /tmp/99-elastic-apm-custom.ini /etc/php82/conf.d/99-elastic-apm-custom.ini
+     chown appuser:appuser /srv/www/var/cache /srv/www/var/log /srv/www/var/sessions
 
 COPY --from=builder /srv/www/docker/etc/nginx/map_block_http_methods.conf /etc/nginx/map_block_http_methods.conf
 COPY --from=builder /srv/www/docker/etc/nginx/apps/drupal/drupal.conf /etc/nginx/apps/drupal/drupal.conf

docker/etc/nginx/custom/headers.conf

@@ -1,5 +1,5 @@
 # Add security headers.
-add_header Content-Security-Policy "worker-src 'self' blob:; script-src 'unsafe-inline'; img-src 'self' data: https:; font-src https: fonts.googleapis.com; report-uri /report-csp-violation; upgrade-insecure-requests";
+add_header Content-Security-Policy "worker-src 'self' blob:; script-src 'self' 'unsafe-inline'; img-src 'self' data: https:; font-src https: fonts.googleapis.com; report-uri /report-csp-violation; upgrade-insecure-requests";
 add_header Referrer-Policy "strict-origin-when-cross-origin";
 add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload; always;";
 add_header X-Content-Options "nosniff";