From d659f90b552c5be1f32a192b09c73da7de6e97d5 Mon Sep 17 00:00:00 2001
From: Remi Cresson <remi.cresson@inrae.fr>
Date: Fri, 23 Dec 2022 10:14:03 +0100
Subject: [PATCH] Revert "1st commit"
This reverts commit 26b552004a67e9e83f1573e7c6da48b1760034d5.
---
Dockerfile | 14 +-------------
README.md | 2 +-
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4b60294..3174dfb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,3 @@
FROM ubuntu/apache2
-RUN apt update && apt install --no-install-recommends -y libapache2-mod-oauth2 && apt-get clean && rm -rf /var/lib/apt/lists/*
-RUN a2enmod headers
-RUN a2enmod oauth2
-RUN sed -i 's#Require all granted#Require valid-user#g' /etc/apache2/apache2.conf
-RUN sed -i 's#<Directory /var/www/>#<Directory /var/www/>\n OAuth2TokenVerify introspect \${TOKEN_ENDPOINT} introspect.ssl_verify=false\&introspect.auth=client_secret_basic\&client_id=\${CLIENT_ID}\&client_secret=\${CLIENT_SECRET}#g' /etc/apache2/apache2.conf
-RUN sed -i 's#<Directory /var/www/>#<Directory /var/www/>\n AuthType oauth2#g' /etc/apache2/apache2.conf
RUN sed -i 's#<Directory /var/www/>#<Directory /var/www/>\n Header set Access-Control-Allow-Origin "*"#g' /etc/apache2/apache2.conf
-RUN sed -i 's#<Directory /var/www/>#<Directory /var/www/>\n SetEnv TOKEN_ENDPOINT ${TOKEN_ENDPOINT}#g' /etc/apache2/apache2.conf
-RUN sed -i 's#<Directory /var/www/>#<Directory /var/www/>\n SetEnv CLIENT_ID ${CLIENT_ID}#g' /etc/apache2/apache2.conf
-RUN sed -i 's#<Directory /var/www/>#<Directory /var/www/>\n SetEnv CLIENT_SECRET ${CLIENT_SECRET}#g' /etc/apache2/apache2.conf
-RUN echo 'export TOKEN_ENDPOINT=${TOKEN_ENDPOINT}' >> /etc/environment && \
- echo 'export CLIENT_ID=${CLIENT_ID}' >> /etc/environment && \
- echo 'export CLIENT_SECRET=${CLIENT_SECRET}' >> /etc/environment
-RUN echo ". /etc/environment" >> /etc/apache2/envvars
+RUN a2enmod headers
diff --git a/README.md b/README.md
index 609ccd5..2bf02be 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# Apache2 CORS + OAuth2
+# Apache2 CORS
--
GitLab