From 6f003bfa4f33d9bb5145466a8d34e89a28810d91 Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Fri, 26 Mar 2021 20:06:15 +0100
Subject: [PATCH] Activate gzip on Marie's website

---
 .../files/website-marie/docker-compose.yml    |  6 ++--
 .../files/website-marie/nginx.conf            | 31 +++++++++++++++++++
 roles/website-marie-docker/tasks/main.yml     |  2 +-
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 roles/website-marie-docker/files/website-marie/nginx.conf

diff --git a/roles/website-marie-docker/files/website-marie/docker-compose.yml b/roles/website-marie-docker/files/website-marie/docker-compose.yml
index 59ff63e..c4e915c 100644
--- a/roles/website-marie-docker/files/website-marie/docker-compose.yml
+++ b/roles/website-marie-docker/files/website-marie/docker-compose.yml
@@ -11,13 +11,15 @@ services:
     labels:
       - "traefik.backend=website-marie"
       - "traefik.docker.network=web"
-      - "traefik.frontend.rule=Host:osteopathie.froidmont.org"
+      - "traefik.frontend.rule=Host:osteopathie.froidmont.org,www.osteopathie.froidmont.org"
+      - "traefik.frontend.redirect.regex=^https?://www.osteopathie.froidmont.org/(.*)"
+      - "traefik.frontend.redirect.replacement=https://osteopathie.froidmont.org/$${1}"
       - "traefik.enable=true"
       - "traefik.port=80"
       - "traefik.default.protocol=http"
     volumes:
       - /var/lib/website-marie:/usr/share/nginx/html:ro
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
     networks:
       - web
     restart: always
-
diff --git a/roles/website-marie-docker/files/website-marie/nginx.conf b/roles/website-marie-docker/files/website-marie/nginx.conf
new file mode 100644
index 0000000..eb515a2
--- /dev/null
+++ b/roles/website-marie-docker/files/website-marie/nginx.conf
@@ -0,0 +1,31 @@
+user  nginx;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}
\ No newline at end of file
diff --git a/roles/website-marie-docker/tasks/main.yml b/roles/website-marie-docker/tasks/main.yml
index ecd224e..75a0cdd 100644
--- a/roles/website-marie-docker/tasks/main.yml
+++ b/roles/website-marie-docker/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: Copy searx config
+- name: Copy website config
   copy:
     src: website-marie
     dest: "{{docker_compose_files_folder}}"