From 9b54b6f6fa36ab373e893abec3c84fb0d803633a Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Sun, 6 Nov 2022 18:13:52 -0700 Subject: [PATCH] Removed .cgi extension --- back/admin.Dockerfile | 11 +++++------ back/dashboard.Dockerfile | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/back/admin.Dockerfile b/back/admin.Dockerfile index f9345b3..9c406f3 100644 --- a/back/admin.Dockerfile +++ b/back/admin.Dockerfile @@ -10,10 +10,9 @@ RUN apt-get update && apt-get install --yes \ && rm -rf /var/lib/apt/lists/* # Create dirs and temp files -RUN mkdir /var/www/cgi-bin/ /usr/lib/wgapi /var/log/wgapi +RUN mkdir /usr/lib/wgapi /var/log/wgapi RUN touch /var/local/wgapi_tokens /var/log/wgapi/wgapi.log -RUN chown -R www-data:www-data /var/www/cgi-bin/ /usr/lib/wgapi \ - /var/log/wgapi /var/local/wgapi_tokens +RUN chown -R www-data:www-data /usr/lib/wgapi /var/log/wgapi /var/local/wgapi_tokens # Configure apache RUN a2enmod cgi rewrite @@ -23,7 +22,7 @@ RUN sed -i "s/^$//" \ /etc/apache2/sites-available/000-default.conf RUN sed -i "s/ServerAdmin .*$/ServerAdmin ${ADMIN_EMAIL}/" \ /etc/apache2/sites-available/000-default.conf -RUN sed -i "s|DocumentRoot .*$|DocumentRoot /var/www/cgi-bin\n\tScriptAlias /peer /var/www/cgi-bin/peer.cgi\n\tScriptAlias /user /var/www/cgi-bin/user.cgi|" \ +RUN sed -i "s|DocumentRoot .*$|DocumentRoot /var/www\n\tScriptAlias / /usr/lib/cgi-bin/|" \ /etc/apache2/sites-available/000-default.conf # Allow http to run these binaries as root with sudo @@ -31,8 +30,8 @@ RUN echo "www-data ALL=(ALL:ALL) NOPASSWD: /usr/bin/wg, /usr/bin/openssl, /usr/b | sudo EDITOR='tee -a' visudo # Copy over CGIs and libs -COPY admin_peer.cgi /var/www/cgi-bin/peer.cgi -COPY admin_user.cgi /var/www/cgi-bin/user.cgi +COPY admin_peer.cgi /usr/lib/cgi-bin/peer.cgi +COPY admin_user.cgi /usr/lib/cgi-bin/user.cgi # TODO: Copy only needed libs COPY lib/ /usr/lib/wgapi/ diff --git a/back/dashboard.Dockerfile b/back/dashboard.Dockerfile index 562a720..ab289e8 100644 --- a/back/dashboard.Dockerfile +++ b/back/dashboard.Dockerfile @@ -31,7 +31,7 @@ RUN echo "www-data ALL=(ALL:ALL) NOPASSWD: /usr/bin/wg, /usr/bin/openssl, /usr/b # Copy over cgi and libs COPY dashboard.cgi /usr/lib/cgi-bin/index.cgi -COPY dashboard_ssl.cgi /usr/lib/cgi-bin/ssl.cgi +COPY dashboard_ssl.cgi /usr/lib/cgi-bin/ssl # TODO: Copy only needed libs COPY lib/ /usr/lib/wgapi/