From ad915416a6886010139413f4fbc41ed827336aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 10 Jan 2019 22:50:34 +0100
Subject: Remove production websites from tool httpd

---
 virtual/eldiron.nix  | 42 +-----------------------------------------
 virtual/packages.nix | 17 +----------------
 2 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index e1edc01..ad94fb2 100644
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -8,7 +8,7 @@
     with mylibs;
     let
         mypkgs = pkgs.callPackage ./packages.nix {
-          inherit checkEnv fetchedGit fetchedGitPrivate fetchedGithub;
+          inherit checkEnv fetchedGit fetchedGithub;
         };
     in
   {
@@ -230,46 +230,6 @@
             mypkgs.davical.apache.vhostConf
           ];
         })
-        (withConf "connexionswing" // {
-          hostName = "connexionswing.com";
-          serverAliases = [ "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
-          documentRoot = mypkgs.connexionswing_prod.webRoot;
-          extraConfig = builtins.concatStringsSep "\n" [
-            mypkgs.connexionswing_prod.apache.vhostConf
-          ];
-        })
-        (withConf "ludivinecassal" // {
-          hostName = "ludivinecassal.com";
-          serverAliases = [ "www.ludivinecassal.com" ];
-          documentRoot = mypkgs.ludivinecassal_prod.webRoot;
-          extraConfig = builtins.concatStringsSep "\n" [
-            mypkgs.ludivinecassal_prod.apache.vhostConf
-          ];
-        })
-        (withConf "piedsjaloux" // {
-          hostName = "piedsjaloux.fr";
-          serverAliases = [ "www.piedsjaloux.fr" ];
-          documentRoot = mypkgs.piedsjaloux_prod.webRoot;
-          extraConfig = builtins.concatStringsSep "\n" [
-            mypkgs.piedsjaloux_prod.apache.vhostConf
-          ];
-        })
-        (withConf "chloe" // {
-          hostName = "osteopathe-cc.fr";
-          serverAliases = [ "www.osteopathe-cc.fr" ];
-          documentRoot = mypkgs.chloe_prod.webRoot;
-          extraConfig = builtins.concatStringsSep "\n" [
-            mypkgs.chloe_prod.apache.vhostConf
-          ];
-        })
-        (withConf "aten" // {
-          hostName = "aten.pro";
-          serverAliases = [ "www.aten.pro" ];
-          documentRoot = mypkgs.aten_prod.webRoot;
-          extraConfig = builtins.concatStringsSep "\n" [
-            mypkgs.aten_prod.apache.vhostConf
-          ];
-        })
         (withConf "eldiron" // {
           hostName = "cloud.immae.eu";
           documentRoot = mypkgs.nextcloud.webRoot;
diff --git a/virtual/packages.nix b/virtual/packages.nix
index 80c0957..fa1b666 100644
--- a/virtual/packages.nix
+++ b/virtual/packages.nix
@@ -1,10 +1,5 @@
-{ callPackage, checkEnv, fetchedGit, fetchedGitPrivate, fetchedGithub }:
+{ callPackage, checkEnv, fetchedGit, fetchedGithub }:
 let
-  connexionswing = callPackage ./packages/connexionswing.nix { inherit checkEnv fetchedGitPrivate; };
-  ludivinecassal = callPackage ./packages/ludivinecassal.nix { inherit checkEnv fetchedGitPrivate; };
-  piedsjaloux = callPackage ./packages/piedsjaloux.nix { inherit checkEnv fetchedGitPrivate; };
-  aten = callPackage ./packages/aten.nix { inherit checkEnv fetchedGitPrivate; };
-  chloe = callPackage ./packages/chloe.nix { inherit checkEnv fetchedGitPrivate; };
   nextcloud = callPackage ./packages/nextcloud.nix { inherit checkEnv; };
   adminer = callPackage ./packages/adminer.nix {};
   ympd = callPackage ./packages/ympd.nix {};
@@ -18,16 +13,6 @@ in
   {
     inherit adminer;
     inherit ympd;
-    connexionswing_dev  = connexionswing { environment = "dev"; };
-    connexionswing_prod = connexionswing { environment = "prod"; };
-    ludivinecassal_dev  = ludivinecassal { environment = "dev"; };
-    ludivinecassal_prod = ludivinecassal { environment = "prod"; };
-    aten_dev  = aten { environment = "dev"; };
-    aten_prod = aten { environment = "prod"; };
-    piedsjaloux_dev  = piedsjaloux { environment = "dev"; };
-    piedsjaloux_prod = piedsjaloux { environment = "prod"; };
-    chloe_dev = chloe { environment = "dev"; };
-    chloe_prod = chloe { environment = "prod"; };
     inherit nextcloud;
     inherit mantisbt;
     inherit ttrss;
-- 
cgit v1.2.3