X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fftp%2Fleila.nix;h=518537214430d911c0e032dd994086e663f21c0e;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=ae917bae343cad5f29aca25ac69347ffb8a433d3;hpb=c336bac4e891ad66c9fa110f840b00cf6bbe72bf;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/ftp/leila.nix b/nixops/modules/websites/ftp/leila.nix
index ae917ba..5185372 100644
--- a/nixops/modules/websites/ftp/leila.nix
+++ b/nixops/modules/websites/ftp/leila.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ lib, pkgs, config, ... }:
 let
     cfg = config.services.myWebsites.Leila;
     varDir = "/var/lib/ftp/leila";
@@ -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,20 +33,13 @@ in {
         php_admin_value[open_basedir] = "${varDir}:/tmp"
         '';
 
-      services.myWebsites.commons.stats.enable = true;
-      services.myWebsites.commons.stats.sites = [
-        {
-          name = "leila.bouya.org";
-          conf = ./leila_goaccess.conf;
-        }
-        {
-          name = "chorale.leila.bouya.org";
-          conf = ./leila_chorale_goaccess.conf;
-        }
+      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";
@@ -72,7 +61,7 @@ in {
             ''
         ];
       };
-      services.myWebsites.production.vhostConfs.leila = {
+      services.websites.production.vhostConfs.leila = {
         certName    = "leila";
         hosts       = [ "leila.bouya.org" ];
         root        = varDir;