From 30217df42aded890f7570fbb691567c22cd6def6 Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Mon, 7 Nov 2022 11:24:13 -0700 Subject: [PATCH] Fixed DocumentRoot --- back/admin.Dockerfile | 3 +-- back/dashboard.Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/back/admin.Dockerfile b/back/admin.Dockerfile index b6cc6b3..7f7e148 100644 --- a/back/admin.Dockerfile +++ b/back/admin.Dockerfile @@ -19,10 +19,9 @@ RUN chown -R www-data:www-data /usr/lib/wgapi /var/log/wgapi /var/local/wgapi_to RUN a2enmod cgi rewrite RUN sed -i "s/^Listen 80$/Listen ${LISTEN_PORT}/" /etc/apache2/ports.conf RUN sed -i -e "s/^$//" \ - -e "s|DocumentRoot .*$|DocumentRoot /usr/lib/cgi-bin/|" \ + -e "s|DocumentRoot .*$|DocumentRoot /usr/lib/cgi-bin\n\tSetHandler cgi-script\n\tOptions +ExecCGI|" \ -e "s/ServerAdmin .*$/ServerAdmin ${ADMIN_EMAIL}/" \ -e "s/#ServerName .*$/ServerName ${SERVER_NAME}/" \ - -e 's|#Include conf-available/serve-cgi-bin.conf|Include conf-available/serve-cgi-bin.conf|' \ /etc/apache2/sites-available/000-default.conf # Allow http user to run these binaries as root with sudo diff --git a/back/dashboard.Dockerfile b/back/dashboard.Dockerfile index dfd3bec..36c9b77 100644 --- a/back/dashboard.Dockerfile +++ b/back/dashboard.Dockerfile @@ -20,10 +20,9 @@ RUN a2enmod cgi rewrite RUN sed -i "s/^Listen 80$/Listen ${LISTEN_PORT}/" \ /etc/apache2/ports.conf RUN sed -i -e "s/^$//" \ - -e "s|DocumentRoot .*$|DocumentRoot /usr/lib/cgi-bin/|" \ + -e "s|DocumentRoot .*$|DocumentRoot /usr/lib/cgi-bin\n\tSetHandler cgi-script\n\tOptions +ExecCGI|" \ -e "s/ServerAdmin .*$/ServerAdmin ${ADMIN_EMAIL}/" \ -e "s/#ServerName .*$/ServerName ${SERVER_NAME}/" \ - -e 's|#Include conf-available/serve-cgi-bin.conf|Include conf-available/serve-cgi-bin.conf|' \ /etc/apache2/sites-available/000-default.conf # Allow http user to run these binaries as root with sudo