aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--virtual/eldiron.nix42
-rw-r--r--virtual/packages.nix17
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 @@
8 with mylibs; 8 with mylibs;
9 let 9 let
10 mypkgs = pkgs.callPackage ./packages.nix { 10 mypkgs = pkgs.callPackage ./packages.nix {
11 inherit checkEnv fetchedGit fetchedGitPrivate fetchedGithub; 11 inherit checkEnv fetchedGit fetchedGithub;
12 }; 12 };
13 in 13 in
14 { 14 {
@@ -230,46 +230,6 @@
230 mypkgs.davical.apache.vhostConf 230 mypkgs.davical.apache.vhostConf
231 ]; 231 ];
232 }) 232 })
233 (withConf "connexionswing" // {
234 hostName = "connexionswing.com";
235 serverAliases = [ "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
236 documentRoot = mypkgs.connexionswing_prod.webRoot;
237 extraConfig = builtins.concatStringsSep "\n" [
238 mypkgs.connexionswing_prod.apache.vhostConf
239 ];
240 })
241 (withConf "ludivinecassal" // {
242 hostName = "ludivinecassal.com";
243 serverAliases = [ "www.ludivinecassal.com" ];
244 documentRoot = mypkgs.ludivinecassal_prod.webRoot;
245 extraConfig = builtins.concatStringsSep "\n" [
246 mypkgs.ludivinecassal_prod.apache.vhostConf
247 ];
248 })
249 (withConf "piedsjaloux" // {
250 hostName = "piedsjaloux.fr";
251 serverAliases = [ "www.piedsjaloux.fr" ];
252 documentRoot = mypkgs.piedsjaloux_prod.webRoot;
253 extraConfig = builtins.concatStringsSep "\n" [
254 mypkgs.piedsjaloux_prod.apache.vhostConf
255 ];
256 })
257 (withConf "chloe" // {
258 hostName = "osteopathe-cc.fr";
259 serverAliases = [ "www.osteopathe-cc.fr" ];
260 documentRoot = mypkgs.chloe_prod.webRoot;
261 extraConfig = builtins.concatStringsSep "\n" [
262 mypkgs.chloe_prod.apache.vhostConf
263 ];
264 })
265 (withConf "aten" // {
266 hostName = "aten.pro";
267 serverAliases = [ "www.aten.pro" ];
268 documentRoot = mypkgs.aten_prod.webRoot;
269 extraConfig = builtins.concatStringsSep "\n" [
270 mypkgs.aten_prod.apache.vhostConf
271 ];
272 })
273 (withConf "eldiron" // { 233 (withConf "eldiron" // {
274 hostName = "cloud.immae.eu"; 234 hostName = "cloud.immae.eu";
275 documentRoot = mypkgs.nextcloud.webRoot; 235 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 @@
1{ callPackage, checkEnv, fetchedGit, fetchedGitPrivate, fetchedGithub }: 1{ callPackage, checkEnv, fetchedGit, fetchedGithub }:
2let 2let
3 connexionswing = callPackage ./packages/connexionswing.nix { inherit checkEnv fetchedGitPrivate; };
4 ludivinecassal = callPackage ./packages/ludivinecassal.nix { inherit checkEnv fetchedGitPrivate; };
5 piedsjaloux = callPackage ./packages/piedsjaloux.nix { inherit checkEnv fetchedGitPrivate; };
6 aten = callPackage ./packages/aten.nix { inherit checkEnv fetchedGitPrivate; };
7 chloe = callPackage ./packages/chloe.nix { inherit checkEnv fetchedGitPrivate; };
8 nextcloud = callPackage ./packages/nextcloud.nix { inherit checkEnv; }; 3 nextcloud = callPackage ./packages/nextcloud.nix { inherit checkEnv; };
9 adminer = callPackage ./packages/adminer.nix {}; 4 adminer = callPackage ./packages/adminer.nix {};
10 ympd = callPackage ./packages/ympd.nix {}; 5 ympd = callPackage ./packages/ympd.nix {};
@@ -18,16 +13,6 @@ in
18 { 13 {
19 inherit adminer; 14 inherit adminer;
20 inherit ympd; 15 inherit ympd;
21 connexionswing_dev = connexionswing { environment = "dev"; };
22 connexionswing_prod = connexionswing { environment = "prod"; };
23 ludivinecassal_dev = ludivinecassal { environment = "dev"; };
24 ludivinecassal_prod = ludivinecassal { environment = "prod"; };
25 aten_dev = aten { environment = "dev"; };
26 aten_prod = aten { environment = "prod"; };
27 piedsjaloux_dev = piedsjaloux { environment = "dev"; };
28 piedsjaloux_prod = piedsjaloux { environment = "prod"; };
29 chloe_dev = chloe { environment = "dev"; };
30 chloe_prod = chloe { environment = "prod"; };
31 inherit nextcloud; 16 inherit nextcloud;
32 inherit mantisbt; 17 inherit mantisbt;
33 inherit ttrss; 18 inherit ttrss;