X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fpiedsjaloux%2Fdefault.nix;h=9f9697d26dc0c18ef0ff9d51045b32144d7de96f;hb=9eae2b47b7b315b05a0e010f3003bd875685e260;hp=b2bd2fd4295b7b4623a072ca60d18dab44d90b90;hpb=1b3154e40a568a296c74759d68827366b5f26da9;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/piedsjaloux/default.nix b/nixops/modules/websites/piedsjaloux/default.nix index b2bd2fd..9f9697d 100644 --- a/nixops/modules/websites/piedsjaloux/default.nix +++ b/nixops/modules/websites/piedsjaloux/default.nix @@ -19,20 +19,10 @@ in { }; }; - imports = [ - ../commons/stats.nix - ]; - config = lib.mkMerge [ (lib.mkIf cfg.production.enable { - mySecrets.keys = piedsjaloux_prod.keys; - services.myWebsites.commons.stats.enable = true; - services.myWebsites.commons.stats.sites = [ - { - name = "piedsjaloux.fr"; - conf = ./goaccess.conf; - } - ]; + secrets.keys = piedsjaloux_prod.keys; + services.webstats.sites = [ { name = "piedsjaloux.fr"; } ]; security.acme.certs."piedsjaloux" = config.services.myCertificates.certConfig // { domain = "piedsjaloux.fr"; @@ -58,7 +48,7 @@ in { }; }) (lib.mkIf cfg.integration.enable { - mySecrets.keys = piedsjaloux_dev.keys; + secrets.keys = piedsjaloux_dev.keys; security.acme.certs."eldiron".extraDomains."piedsjaloux.immae.eu" = null; services.myPhpfpm.preStart.piedsjaloux_dev = piedsjaloux_dev.phpFpm.preStart; services.myPhpfpm.serviceDependencies.piedsjaloux_dev = piedsjaloux_dev.phpFpm.serviceDeps;