From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Mon, 15 Jun 2020 11:23:48 +0000 (+0200)
Subject: Modify buildbot output paths
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=cb589b2e41d966719ab7c21ea6dbf0869c3b0eed

Modify buildbot output paths
---

diff --git a/modules/private/buildbot/projects/denise/__init__.py b/modules/private/buildbot/projects/denise/__init__.py
index 8809d3d..c07655b 100644
--- a/modules/private/buildbot/projects/denise/__init__.py
+++ b/modules/private/buildbot/projects/denise/__init__.py
@@ -14,7 +14,7 @@ class E():
     SSH_KEY_PATH      = "/var/lib/buildbot/buildbot_key"
     SSH_HOST_KEY      = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFbhFTl2A2RJn5L51yxJM4XfCS2ZaiSX/jo9jFSdghF"
 
-    OMS_RELEASE_PATH  = "/var/lib/buildbot/outputs/denise_oms"
+    OMS_RELEASE_PATH  = "/var/lib/buildbot/outputs/denise/oms"
     OMS_GIT_URL       = "gitolite@git.immae.eu:perso/Denise/oms"
 
     # master.cfg
diff --git a/modules/private/buildbot/projects/immaeEu/__init__.py b/modules/private/buildbot/projects/immaeEu/__init__.py
index 575f083..dfe684c 100644
--- a/modules/private/buildbot/projects/immaeEu/__init__.py
+++ b/modules/private/buildbot/projects/immaeEu/__init__.py
@@ -22,14 +22,14 @@ class E():
     COURS_GIT_URL      = "gitolite@git.immae.eu:perso/Immae/Sites/Cours"
     NORMALESUP_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Projets/Sites/Normalesup"
 
-    COURS_RELEASE_PATH      = "/var/lib/buildbot/outputs/cours"
+    COURS_RELEASE_PATH      = "/var/lib/buildbot/outputs/immae/cours"
     COURS_TARBALL_PATH      = "/var/lib/ftp/release.immae.eu/cours"
     COURS_TARBALL_URL       = "https://release.immae.eu/cours"
-    BIP39_RELEASE_PATH      = "/var/lib/buildbot/outputs/bip39"
+    BIP39_RELEASE_PATH      = "/var/lib/buildbot/outputs/immae/bip39"
     HISTORY_RELEASE_PATH    = "/var/lib/buildbot/outputs/immae/history"
-    IMMAE_EU_RELEASE_PATH   = "/var/lib/buildbot/outputs/immaeEu"
-    RECETTES_RELEASE_PATH   = "/var/lib/buildbot/outputs/recettes"
-    NORMALESUP_RELEASE_PATH = "/var/lib/buildbot/outputs/recherche"
+    IMMAE_EU_RELEASE_PATH   = "/var/lib/buildbot/outputs/immae/blog"
+    RECETTES_RELEASE_PATH   = "/var/lib/buildbot/outputs/immae/recettes"
+    NORMALESUP_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/recherche"
     GSMCELLS_RELEASE_PATH   = "/var/lib/ftp/release.immae.eu/gsm_cells"
     GSMCELLS_RELEASE_URL    = "https://release.immae.eu/gsm_cells"
 
diff --git a/modules/private/websites/denise/oms.nix b/modules/private/websites/denise/oms.nix
index 9650468..81a996b 100644
--- a/modules/private/websites/denise/oms.nix
+++ b/modules/private/websites/denise/oms.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }:
 let
   cfg = config.myServices.websites.denise.oms;
-  varDir = "/var/lib/buildbot/outputs/denise_oms";
+  varDir = "/var/lib/buildbot/outputs/denise/oms";
   socket = "/run/denise_oms/socket.sock";
 in {
   options.myServices.websites.denise.oms.enable = lib.mkEnableOption "enable Denise's OMS website";
diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix
index bb110de..890a5af 100644
--- a/modules/private/websites/immae/production.nix
+++ b/modules/private/websites/immae/production.nix
@@ -1,10 +1,10 @@
 { lib, pkgs, config,  ... }:
 let
   cfg = config.myServices.websites.immae.production;
-  varDir = "/var/lib/buildbot/outputs/immaeEu";
-  coursDir = "/var/lib/buildbot/outputs/cours";
-  rechercheDir = "/var/lib/buildbot/outputs/recherche";
-  recettesDir = "/var/lib/buildbot/outputs/recettes";
+  varDir = "/var/lib/buildbot/outputs/immae/blog";
+  coursDir = "/var/lib/buildbot/outputs/immae/cours";
+  rechercheDir = "/var/lib/buildbot/outputs/immae/recherche";
+  recettesDir = "/var/lib/buildbot/outputs/immae/recettes";
   historyDir = "/var/lib/buildbot/outputs/immae/history";
   env = config.myEnv.websites.immae;
 in {
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index cdfc7eb..7a9a125 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -167,8 +167,8 @@ in {
             Options -Indexes
           </Directory>
 
-          Alias /BIP39 /var/lib/buildbot/outputs/bip39
-          <Directory "/var/lib/buildbot/outputs/bip39">
+          Alias /BIP39 /var/lib/buildbot/outputs/immae/bip39
+          <Directory "/var/lib/buildbot/outputs/immae/bip39">
             DirectoryIndex index.html
             AllowOverride None
             Require all granted