diff --git a/Readme.md b/Readme.md index 7c1bac5bc8030b1afebf3c68701a835f71831935..9710bedaa42a87bc4df596789d86fd7c2ce0c124 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 d86b0f8b12c2461a0c823501992676c6f41dd5f9..c23432ef270b0907c57440ab0550af7d7f37697f 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