Remove direct dependency to myconfig in database modules

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tellesflorian / default.nix

diff --git a/nixops/modules/websites/tellesflorian/default.nix b/nixops/modules/websites/tellesflorian/default.nix
index da4b5a608edbaacfd690c3267207e96191457d09..bbbde07ff7cb93a9b14320b6966252a9c05a76c7 100644 (file)
--- a/nixops/modules/websites/tellesflorian/default.nix
+++ b/nixops/modules/websites/tellesflorian/default.nix
@@ -3,7 +3,7 @@ let
   adminer = pkgs.callPackage ../commons/adminer.nix {};
 
   tellesflorian_dev  = pkgs.callPackage ./tellesflorian.nix {
-    inherit (pkgs.private.webapps) tellesflorian;
+    inherit (pkgs.webapps) tellesflorian;
     config = myconfig.env.websites.tellesflorian.integration;
   };
 
@@ -17,7 +17,6 @@ in {
 
   config = lib.mkIf cfg.integration.enable {
     secrets.keys = tellesflorian_dev.keys;
-    security.acme.certs."eldiron".extraDomains."app.tellesflorian.com" = null;
     services.myPhpfpm.preStart.tellesflorian_dev = tellesflorian_dev.phpFpm.preStart;
     services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian_dev.phpFpm.serviceDeps;
     services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian_dev.phpFpm.pool;
@@ -26,9 +25,10 @@ in {
       mkdir -p $out/webapps
       ln -s ${tellesflorian_dev.app.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName}
       '';
-    services.myWebsites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules;
-    services.myWebsites.integration.vhostConfs.tellesflorian = {
+    services.websites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules;
+    services.websites.integration.vhostConfs.tellesflorian = {
       certName    = "eldiron";
+      addToCerts  = true;
       hosts       = ["app.tellesflorian.com" ];
       root        = tellesflorian_dev.apache.root;
       extraConfig = [