Add certificate creation and handling to websites

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

diff --git a/nixops/modules/websites/ftp/papa.nix b/nixops/modules/websites/ftp/papa.nix
index ca1aabe65f36cb3953980933bf8c32a348ac361e..c8d05ef8348fdb25d5320ad84519950da308935d 100644 (file)
--- a/nixops/modules/websites/ftp/papa.nix
+++ b/nixops/modules/websites/ftp/papa.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Papa;
     varDir = "/var/lib/ftp/papa";
@@ -11,9 +11,6 @@ in {
 
   config = lib.mkIf cfg.production.enable {
     security.acme.certs."ftp".extraDomains."surveillance.maison.bbc.bouya.org" = null;
-    security.acme.certs."papa" = config.services.myCertificates.certConfig // {
-      domain = "surveillance.maison.bbc.bouya.org";
-    };
 
     services.cron = {
       systemCronJobs = let
@@ -34,11 +31,12 @@ in {
       ];
     };
 
-    services.myWebsites.production.vhostConfs.papa = {
-      certName    = "papa";
-      hosts       = [ "surveillance.maison.bbc.bouya.org" ];
-      root        = varDir;
-      extraConfig = [
+    services.websites.production.vhostConfs.papa = {
+      certName     = "papa";
+      certMainHost = "surveillance.maison.bbc.bouya.org";
+      hosts        = [ "surveillance.maison.bbc.bouya.org" ];
+      root         = varDir;
+      extraConfig  = [
         ''
         Use Apaxy "${varDir}" "title .duplicity-ignore"
         <Directory ${varDir}>