X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fludivine%2Fdefault.nix;h=af18d71d93a6c454993aa946faec0a793edc7e72;hb=b7ee93fcdee2509cd4c0caec2c5c59ccff5bab2c;hp=bcbef51a818a99d795674f8d3e99c5351714416b;hpb=e5073addbe397afd596613af469f3308a07c1801;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/ludivine/default.nix b/nixops/modules/websites/ludivine/default.nix index bcbef51..af18d71 100644 --- a/nixops/modules/websites/ludivine/default.nix +++ b/nixops/modules/websites/ludivine/default.nix @@ -21,12 +21,10 @@ in { config = lib.mkMerge [ (lib.mkIf cfg.production.enable { + secrets.keys = ludivinecassal_prod.keys; services.myWebsites.commons.stats.enable = true; services.myWebsites.commons.stats.sites = [ - { - name = "ludivinecassal.com"; - conf = ./goaccess.conf; - } + { name = "ludivinecassal.com"; } ]; security.acme.certs."ludivinecassal" = config.services.myCertificates.certConfig // { @@ -36,6 +34,8 @@ in { }; }; + services.myPhpfpm.preStart.ludivinecassal_prod = ludivinecassal_prod.phpFpm.preStart; + services.myPhpfpm.serviceDependencies.ludivinecassal_prod = ludivinecassal_prod.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.ludivinecassal_prod = ludivinecassal_prod.phpFpm.pool; system.activationScripts.ludivinecassal_prod = ludivinecassal_prod.activationScript; system.extraSystemBuilderCmds = '' @@ -46,13 +46,16 @@ in { services.myWebsites.production.vhostConfs.ludivine = { certName = "ludivinecassal"; hosts = ["ludivinecassal.com" "www.ludivinecassal.com" ]; - root = ludivinecassal_prod.webRoot; + root = ludivinecassal_prod.apache.root; extraConfig = [ ludivinecassal_prod.apache.vhostConf ]; }; }) (lib.mkIf cfg.integration.enable { + secrets.keys = ludivinecassal_dev.keys; security.acme.certs."eldiron".extraDomains."ludivine.immae.eu" = null; + services.myPhpfpm.preStart.ludivinecassal_dev = ludivinecassal_dev.phpFpm.preStart; + services.myPhpfpm.serviceDependencies.ludivinecassal_dev = ludivinecassal_dev.phpFpm.serviceDeps; services.myPhpfpm.poolConfigs.ludivinecassal_dev = ludivinecassal_dev.phpFpm.pool; system.activationScripts.ludivinecassal_dev = ludivinecassal_dev.activationScript; system.extraSystemBuilderCmds = ''