X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fpapa%2Fmaison_bbc.nix;h=528c83209bb94df0df82729bb1f086202fceb792;hb=f5cbc6f767ee234e9cdd53baa113d5ab26edb6d8;hp=eb61b6d95e02f78672e7a18013a481c7c263c8b9;hpb=d5b16fe0827745409206fc5df0fe06d8fa293ff7;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/papa/maison_bbc.nix b/modules/private/websites/papa/maison_bbc.nix
index eb61b6d..528c832 100644
--- a/modules/private/websites/papa/maison_bbc.nix
+++ b/modules/private/websites/papa/maison_bbc.nix
@@ -1,71 +1,26 @@
-{ lib, pkgs, config, ... }:
+{ lib, config, ... }:
let
cfg = config.myServices.websites.papa.maison_bbc;
- varDir = "/var/lib/ftp/papa/site";
+ webappdirs = config.services.websites.webappDirsPaths;
in {
options.myServices.websites.papa.maison_bbc.enable = lib.mkEnableOption "enable Papa Maison bbc website";
config = lib.mkIf cfg.enable {
- services.duplyBackup.profiles.papa_maison_bbc.rootDir = varDir;
services.webstats.sites = [ { name = "maison.bbc.bouya.org"; } ];
- services.phpfpm.pools.papa_maison_bbc = {
- listen = "/run/phpfpm/papa_maison_bbc.sock";
- extraConfig = ''
- user = wwwrun
- group = wwwrun
- listen.owner = wwwrun
- listen.group = wwwrun
- pm = ondemand
- pm.max_children = 5
- pm.process_idle_timeout = 60
-
- php_admin_value[open_basedir] = "${varDir}"
- '';
- phpOptions = config.services.phpfpm.phpOptions + ''
- date.timezone = 'Europe/Paris'
- extension=${pkgs.php}/lib/php/extensions/mysqli.so
- '';
- };
-
- services.websites.env.production.modules = [ "proxy_fcgi" ];
- services.websites.env.production.vhostNoSSLConfs.papa_maison_bbc = {
- hosts = [ "maison.bbc.bouya.org" ];
- 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
-
- DirectoryIndex index.php index.htm index.html
- AllowOverride None
- Require all granted
-
- SetHandler "proxy:unix:/run/phpfpm/papa_maison_bbc.sock|fcgi://localhost"
-
-
-
- Options Indexes FollowSymLinks
- AllowOverride None
- Require all granted
-
- ''
- ];
- };
+ services.websites.webappDirs.papa_maison_bbc = ./maison_bbc_static;
services.websites.env.production.vhostConfs.papa_maison_bbc = {
certName = "papa";
addToCerts = true;
hosts = [ "maison.bbc.bouya.org" ];
- root = varDir;
+ root = webappdirs.papa_maison_bbc;
extraConfig = [
''
-
- DirectoryIndex index.php index.htm index.html
+ ErrorDocument 404 /index.html
+
+ DirectoryIndex index.htm index.html
AllowOverride None
Require all granted
-
- SetHandler "proxy:unix:/run/phpfpm/papa_maison_bbc.sock|fcgi://localhost"
-
''
];