Start moving websites configuration to modules

[perso/Immae/Config/Nix.git] / nixops / modules / websites / ftp / leila.nix

diff --git a/nixops/modules/websites/ftp/leila.nix b/nixops/modules/websites/ftp/leila.nix
index d5c27faadbf131906f01ec08f6e6dbef5e7213cd..518537214430d911c0e032dd994086e663f21c0e 100644 (file)
--- a/nixops/modules/websites/ftp/leila.nix
+++ b/nixops/modules/websites/ftp/leila.nix
@@ -9,10 +9,6 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = (lib.mkIf cfg.production.enable {
       security.acme.certs."leila" = config.services.myCertificates.certConfig // {
         domain = "leila.bouya.org";
@@ -37,14 +33,13 @@ in {
         php_admin_value[open_basedir] = "${varDir}:/tmp"
         '';
 
-      services.myWebsites.commons.stats.enable = true;
-      services.myWebsites.commons.stats.sites = [
+      services.webstats.sites = [
         { name = "leila.bouya.org"; }
         { name = "chorale.leila.bouya.org"; }
       ];
 
-      services.myWebsites.production.modules = [ "proxy_fcgi" ];
-      services.myWebsites.production.vhostConfs.leila_chorale = {
+      services.websites.production.modules = [ "proxy_fcgi" ];
+      services.websites.production.vhostConfs.leila_chorale = {
         certName    = "leila";
         hosts       = [ "chorale.leila.bouya.org" "chorale-vocanta.fr.nf" "www.chorale-vocanta.fr.nf" ];
         root        = "${varDir}/Chorale";
@@ -66,7 +61,7 @@ in {
             ''
         ];
       };
-      services.myWebsites.production.vhostConfs.leila = {
+      services.websites.production.vhostConfs.leila = {
         certName    = "leila";
         hosts       = [ "leila.bouya.org" ];
         root        = varDir;