From d5b16fe0827745409206fc5df0fe06d8fa293ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Tue, 3 Mar 2020 17:02:47 +0100
Subject: Fix maison bbc website and monitoring

---
 modules/private/websites/papa/maison_bbc.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'modules/private/websites/papa')

diff --git a/modules/private/websites/papa/maison_bbc.nix b/modules/private/websites/papa/maison_bbc.nix
index 7295de8..eb61b6d 100644
--- a/modules/private/websites/papa/maison_bbc.nix
+++ b/modules/private/websites/papa/maison_bbc.nix
@@ -23,6 +23,7 @@ in {
         php_admin_value[open_basedir] = "${varDir}"
         '';
       phpOptions = config.services.phpfpm.phpOptions + ''
+        date.timezone = 'Europe/Paris'
         extension=${pkgs.php}/lib/php/extensions/mysqli.so
         '';
     };
@@ -33,6 +34,7 @@ in {
       root         = varDir;
       extraConfig  = [
         ''
+        Alias /.well-known/acme-challenge ${config.security.acme2.certs.papa.webroot}/.well-known/acme-challenge
         RedirectMatch 301 ^/((?!(\.well-known|add.php).*$).*)$ https://maison.bbc.bouya.org/$1
         <Directory ${varDir}>
           DirectoryIndex index.php index.htm index.html
@@ -41,6 +43,11 @@ in {
           <FilesMatch "\.php$">
             SetHandler "proxy:unix:/run/phpfpm/papa_maison_bbc.sock|fcgi://localhost"
           </FilesMatch>
+        </Directory>
+        <Directory "${config.security.acme2.certs.papa.webroot}">
+          Options Indexes FollowSymLinks
+          AllowOverride None
+          Require all granted
         </Directory>
           ''
       ];
-- 
cgit v1.2.3