Start moving websites configuration to modules

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

diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix
index e31a5746e9aaa305dbc9dbef44926fb585b1a3ef..3643e190a19439c5a83a6ea51ed03e1149fdefd4 100644 (file)
--- a/nixops/modules/websites/connexionswing/default.nix
+++ b/nixops/modules/websites/connexionswing/default.nix
@@ -1,11 +1,11 @@
 { lib, pkgs, config,  myconfig, ... }:
 let
   connexionswing_dev  = pkgs.callPackage ./connexionswing.nix {
-    inherit (pkgs.private.webapps) connexionswing;
+    inherit (pkgs.webapps) connexionswing;
     config = myconfig.env.websites.connexionswing.integration;
   };
   connexionswing_prod = pkgs.callPackage ./connexionswing.nix {
-    inherit (pkgs.private.webapps) connexionswing;
+    inherit (pkgs.webapps) connexionswing;
     config = myconfig.env.websites.connexionswing.production;
   };
 
@@ -43,8 +43,8 @@ in {
         mkdir -p $out/webapps
         ln -s ${connexionswing_prod.app.webRoot} $out/webapps/${connexionswing_prod.apache.webappName}
         '';
-      services.myWebsites.production.modules = connexionswing_prod.apache.modules;
-      services.myWebsites.production.vhostConfs.connexionswing = {
+      services.websites.production.modules = connexionswing_prod.apache.modules;
+      services.websites.production.vhostConfs.connexionswing = {
         certName    = "connexionswing";
         hosts       = ["connexionswing.com" "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
         root        = connexionswing_prod.apache.root;
@@ -64,8 +64,8 @@ in {
         mkdir -p $out/webapps
         ln -s ${connexionswing_dev.app.webRoot} $out/webapps/${connexionswing_dev.apache.webappName}
         '';
-      services.myWebsites.integration.modules = connexionswing_dev.apache.modules;
-      services.myWebsites.integration.vhostConfs.connexionswing = {
+      services.websites.integration.modules = connexionswing_dev.apache.modules;
+      services.websites.integration.vhostConfs.connexionswing = {
         certName    = "eldiron";
         hosts       = ["connexionswing.immae.eu" "sandetludo.immae.eu" ];
         root        = connexionswing_dev.apache.root;