Remove direct dependency to myconfig in database 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 ae917bae343cad5f29aca25ac69347ffb8a433d3..14bfa20941c797bb887631779e3343007619f0ee 100644 (file)
--- 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,20 +9,7 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = (lib.mkIf cfg.production.enable {
-      security.acme.certs."leila" = config.services.myCertificates.certConfig // {
-        domain = "leila.bouya.org";
-        extraDomains = {
-          "chorale.leila.bouya.org" = null;
-          "chorale-vocanta.fr.nf" = null;
-          "www.chorale-vocanta.fr.nf" = null;
-        };
-      };
-
       services.myPhpfpm.poolConfigs.leila = ''
         listen = /run/phpfpm/leila.sock
         user = wwwrun
@@ -37,21 +24,15 @@ 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";
+        addToCerts  = true;
         hosts       = [ "chorale.leila.bouya.org" "chorale-vocanta.fr.nf" "www.chorale-vocanta.fr.nf" ];
         root        = "${varDir}/Chorale";
         extraConfig = [
@@ -72,11 +53,12 @@ in {
             ''
         ];
       };
-      services.myWebsites.production.vhostConfs.leila = {
-        certName    = "leila";
-        hosts       = [ "leila.bouya.org" ];
-        root        = varDir;
-        extraConfig = [
+      services.websites.production.vhostConfs.leila = {
+        certName     = "leila";
+        certMainHost = "leila.bouya.org";
+        hosts        = [ "leila.bouya.org" ];
+        root         = varDir;
+        extraConfig  = [
           ''
           Use Stats leila.bouya.org
           <Directory ${varDir}/Chorale>