X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Faten%2Fdefault.nix;h=fd002a5a114fd9413e5688a073097e896fdf51e0;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=efd3619088c8942ab8b3cf3fd8178320b4d85e56;hpb=1bd8b03eeaafa9345282d8aaf6499bc80adf062f;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/aten/default.nix b/nixops/modules/websites/aten/default.nix
index efd3619..fd002a5 100644
--- a/nixops/modules/websites/aten/default.nix
+++ b/nixops/modules/websites/aten/default.nix
@@ -1,11 +1,11 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
   aten_dev = pkgs.callPackage ./aten.nix {
-    inherit (pkgs.private.webapps) aten;
+    inherit (pkgs.webapps) aten;
     config = myconfig.env.websites.aten.integration;
   };
   aten_prod = pkgs.callPackage ./aten.nix {
-    inherit (pkgs.private.webapps) aten;
+    inherit (pkgs.webapps) aten;
     config = myconfig.env.websites.aten.production;
   };
 
@@ -40,9 +40,8 @@ in {
         mkdir -p $out/webapps
         ln -s ${aten_prod.app.webRoot} $out/webapps/${aten_prod.apache.webappName}
         '';
-      services.myWebsites.apacheConfig.aten_prod.modules = aten_prod.apache.modules;
-      services.myWebsites.production.modules = aten_prod.apache.modules;
-      services.myWebsites.production.vhostConfs.aten = {
+      services.websites.production.modules = aten_prod.apache.modules;
+      services.websites.production.vhostConfs.aten = {
         certName    = "aten";
         hosts       = [ "aten.pro" "www.aten.pro" ];
         root        = aten_prod.apache.root;
@@ -60,8 +59,8 @@ in {
         mkdir -p $out/webapps
         ln -s ${aten_dev.app.webRoot} $out/webapps/${aten_dev.apache.webappName}
         '';
-      services.myWebsites.integration.modules = aten_dev.apache.modules;
-      services.myWebsites.integration.vhostConfs.aten = {
+      services.websites.integration.modules = aten_dev.apache.modules;
+      services.websites.integration.vhostConfs.aten = {
         certName    = "eldiron";
         hosts       = [ "dev.aten.pro" ];
         root        = aten_dev.apache.root;