X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fimmae%2Fproduction.nix;h=e02d026fc2f91acba7ceabe50283479056270eba;hb=8fa7ff2c63fb0722144bc90837512d9f8b8c929d;hp=3c851e68a37ccc9e7b9cba4f034b911484507515;hpb=29f8cb850d74b456d6481a456311bbf5361d328c;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix index 3c851e6..e02d026 100644 --- a/modules/private/websites/immae/production.nix +++ b/modules/private/websites/immae/production.nix @@ -1,7 +1,7 @@ { lib, pkgs, config, myconfig, ... }: let cfg = config.myServices.websites.immae.production; - varDir = "/var/lib/ftp/immae"; + varDir = "/var/lib/buildbot/outputs/immaeEu"; env = myconfig.env.websites.immae; in { options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website"; @@ -9,20 +9,6 @@ in { config = lib.mkIf cfg.enable { services.webstats.sites = [ { name = "www.immae.eu"; } ]; - services.phpfpm.poolConfigs.immae = '' - listen = /run/phpfpm/immae.sock - 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}:/tmp" - ''; - services.websites.env.production.modules = [ "proxy_fcgi" ]; services.websites.env.production.vhostConfs.immae = { certName = "eldiron"; addToCerts = true; @@ -32,21 +18,12 @@ in { '' Use Stats www.immae.eu - - SetHandler "proxy:unix:/run/phpfpm/immae.sock|fcgi://localhost" - - DirectoryIndex index.php index.htm index.html Options Indexes FollowSymLinks MultiViews Includes AllowOverride All Require all granted - - - Use LDAPConnect - Require ldap-group cn=blog,cn=immae.eu,ou=services,dc=immae,dc=eu - '' ]; };