X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fftp%2Fjerome.nix;h=a340644e60be27dbd18a44f4586a9e224764028e;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=e04d6408ebe6ce448cca25d86918f24514b81a1f;hpb=b7ee93fcdee2509cd4c0caec2c5c59ccff5bab2c;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/ftp/jerome.nix b/nixops/modules/websites/ftp/jerome.nix index e04d640..a340644 100644 --- a/nixops/modules/websites/ftp/jerome.nix +++ b/nixops/modules/websites/ftp/jerome.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, myconfig, mylibs, ... }: +{ lib, pkgs, config, myconfig, ... }: let adminer = pkgs.callPackage ../commons/adminer.nix {}; cfg = config.services.myWebsites.Jerome; @@ -11,15 +11,8 @@ in { }; }; - imports = [ - ../commons/stats.nix - ]; - config = lib.mkIf cfg.production.enable { - services.myWebsites.commons.stats.enable = true; - services.myWebsites.commons.stats.sites = [ - { name = "naturaloutil.immae.eu"; } - ]; + services.webstats.sites = [ { name = "naturaloutil.immae.eu"; } ]; security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null; security.acme.certs."naturaloutil" = config.services.myCertificates.certConfig // { @@ -65,8 +58,8 @@ in { services.myPhpfpm.poolPhpConfigs.jerome = '' extension=${pkgs.php}/lib/php/extensions/mysqli.so ''; - services.myWebsites.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ]; - services.myWebsites.production.vhostConfs.naturaloutil = { + services.websites.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ]; + services.websites.production.vhostConfs.naturaloutil = { certName = "naturaloutil"; hosts = ["naturaloutil.immae.eu" ]; root = varDir;