aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/papa
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-03-03 17:02:47 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-03-03 17:02:47 +0100
commitd5b16fe0827745409206fc5df0fe06d8fa293ff7 (patch)
treefbdec297937798c3e0e62f821395315017a6e146 /modules/private/websites/papa
parent10dad16b8bff75321112ff7145bd958d5a6c5546 (diff)
downloadNix-d5b16fe0827745409206fc5df0fe06d8fa293ff7.tar.gz
Nix-d5b16fe0827745409206fc5df0fe06d8fa293ff7.tar.zst
Nix-d5b16fe0827745409206fc5df0fe06d8fa293ff7.zip
Fix maison bbc website and monitoring
Diffstat (limited to 'modules/private/websites/papa')
-rw-r--r--modules/private/websites/papa/maison_bbc.nix7
1 files changed, 7 insertions, 0 deletions
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 {
23 php_admin_value[open_basedir] = "${varDir}" 23 php_admin_value[open_basedir] = "${varDir}"
24 ''; 24 '';
25 phpOptions = config.services.phpfpm.phpOptions + '' 25 phpOptions = config.services.phpfpm.phpOptions + ''
26 date.timezone = 'Europe/Paris'
26 extension=${pkgs.php}/lib/php/extensions/mysqli.so 27 extension=${pkgs.php}/lib/php/extensions/mysqli.so
27 ''; 28 '';
28 }; 29 };
@@ -33,6 +34,7 @@ in {
33 root = varDir; 34 root = varDir;
34 extraConfig = [ 35 extraConfig = [
35 '' 36 ''
37 Alias /.well-known/acme-challenge ${config.security.acme2.certs.papa.webroot}/.well-known/acme-challenge
36 RedirectMatch 301 ^/((?!(\.well-known|add.php).*$).*)$ https://maison.bbc.bouya.org/$1 38 RedirectMatch 301 ^/((?!(\.well-known|add.php).*$).*)$ https://maison.bbc.bouya.org/$1
37 <Directory ${varDir}> 39 <Directory ${varDir}>
38 DirectoryIndex index.php index.htm index.html 40 DirectoryIndex index.php index.htm index.html
@@ -42,6 +44,11 @@ in {
42 SetHandler "proxy:unix:/run/phpfpm/papa_maison_bbc.sock|fcgi://localhost" 44 SetHandler "proxy:unix:/run/phpfpm/papa_maison_bbc.sock|fcgi://localhost"
43 </FilesMatch> 45 </FilesMatch>
44 </Directory> 46 </Directory>
47 <Directory "${config.security.acme2.certs.papa.webroot}">
48 Options Indexes FollowSymLinks
49 AllowOverride None
50 Require all granted
51 </Directory>
45 '' 52 ''
46 ]; 53 ];
47 }; 54 };