From bfb8d1ebb1c2088d94a883685b92894ca8cabf15 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Tue, 7 Apr 2020 19:24:34 +0200
Subject: [PATCH] Set X-FRAMA-SITE correctly
---
Readme.md | 10 ++++------
docker/Dockerfile | 1 +
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Readme.md b/Readme.md
index 7c1bac5..9710bed 100644
--- a/Readme.md
+++ b/Readme.md
@@ -32,19 +32,17 @@ Adapt this file and add it to `/etc/apache2/sites-available/mysite.conf` (replac
```apache2
<VirtualHost *:80>
ServerName mysite.fqdn
+ ServerAlias mysecondsite.fqdn
+ ServerAlias mythirdsite.fqdn
#ProxyVia On
#ProxyRequests On
ProxyPreserveHost on
- Header set X-FRAMA-SITE mysite.fqdn
-
ProxyPass / http://127.0.0.1:8000/
ProxyPassReverse / http://127.0.0.1:8000/
- CustomLog ${APACHE_LOG_DIR}/mysite.tetras-libre.access.log combined
- ErrorLog ${APACHE_LOG_DIR}/mysite-libre.error.log
+ CustomLog ${APACHE_LOG_DIR}/noemie.access.log combined
+ ErrorLog ${APACHE_LOG_DIR}/noemie-libre.error.log
</VirtualHost>
```
-
-Finaly run `certbot` to use HTTPS
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d86b0f8..c23432e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,5 +25,6 @@ RUN git clone https://framagit.org/framasoft/PrettyNoemieCMS html
WORKDIR /var/www/html
RUN /usr/local/bin/composer.phar install
RUN chown -R www-data /var/www/html/
+RUN echo "SetEnv X-FRAMA-SITE" >> /var/www/html/.htaccess
RUN a2enmod rewrite
--
GitLab