diff options
Diffstat (limited to 'modules/private')
-rw-r--r-- | modules/private/buildbot/projects/denise/__init__.py | 2 | ||||
-rw-r--r-- | modules/private/buildbot/projects/immaeEu/__init__.py | 10 | ||||
-rw-r--r-- | modules/private/websites/denise/oms.nix | 2 | ||||
-rw-r--r-- | modules/private/websites/immae/production.nix | 8 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/default.nix | 4 |
5 files changed, 13 insertions, 13 deletions
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(): | |||
14 | SSH_KEY_PATH = "/var/lib/buildbot/buildbot_key" | 14 | SSH_KEY_PATH = "/var/lib/buildbot/buildbot_key" |
15 | SSH_HOST_KEY = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFbhFTl2A2RJn5L51yxJM4XfCS2ZaiSX/jo9jFSdghF" | 15 | SSH_HOST_KEY = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFbhFTl2A2RJn5L51yxJM4XfCS2ZaiSX/jo9jFSdghF" |
16 | 16 | ||
17 | OMS_RELEASE_PATH = "/var/lib/buildbot/outputs/denise_oms" | 17 | OMS_RELEASE_PATH = "/var/lib/buildbot/outputs/denise/oms" |
18 | OMS_GIT_URL = "gitolite@git.immae.eu:perso/Denise/oms" | 18 | OMS_GIT_URL = "gitolite@git.immae.eu:perso/Denise/oms" |
19 | 19 | ||
20 | # master.cfg | 20 | # 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(): | |||
22 | COURS_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Cours" | 22 | COURS_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Sites/Cours" |
23 | NORMALESUP_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Projets/Sites/Normalesup" | 23 | NORMALESUP_GIT_URL = "gitolite@git.immae.eu:perso/Immae/Projets/Sites/Normalesup" |
24 | 24 | ||
25 | COURS_RELEASE_PATH = "/var/lib/buildbot/outputs/cours" | 25 | COURS_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/cours" |
26 | COURS_TARBALL_PATH = "/var/lib/ftp/release.immae.eu/cours" | 26 | COURS_TARBALL_PATH = "/var/lib/ftp/release.immae.eu/cours" |
27 | COURS_TARBALL_URL = "https://release.immae.eu/cours" | 27 | COURS_TARBALL_URL = "https://release.immae.eu/cours" |
28 | BIP39_RELEASE_PATH = "/var/lib/buildbot/outputs/bip39" | 28 | BIP39_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/bip39" |
29 | HISTORY_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/history" | 29 | HISTORY_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/history" |
30 | IMMAE_EU_RELEASE_PATH = "/var/lib/buildbot/outputs/immaeEu" | 30 | IMMAE_EU_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/blog" |
31 | RECETTES_RELEASE_PATH = "/var/lib/buildbot/outputs/recettes" | 31 | RECETTES_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/recettes" |
32 | NORMALESUP_RELEASE_PATH = "/var/lib/buildbot/outputs/recherche" | 32 | NORMALESUP_RELEASE_PATH = "/var/lib/buildbot/outputs/immae/recherche" |
33 | GSMCELLS_RELEASE_PATH = "/var/lib/ftp/release.immae.eu/gsm_cells" | 33 | GSMCELLS_RELEASE_PATH = "/var/lib/ftp/release.immae.eu/gsm_cells" |
34 | GSMCELLS_RELEASE_URL = "https://release.immae.eu/gsm_cells" | 34 | GSMCELLS_RELEASE_URL = "https://release.immae.eu/gsm_cells" |
35 | 35 | ||
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 @@ | |||
1 | { lib, config, pkgs, ... }: | 1 | { lib, config, pkgs, ... }: |
2 | let | 2 | let |
3 | cfg = config.myServices.websites.denise.oms; | 3 | cfg = config.myServices.websites.denise.oms; |
4 | varDir = "/var/lib/buildbot/outputs/denise_oms"; | 4 | varDir = "/var/lib/buildbot/outputs/denise/oms"; |
5 | socket = "/run/denise_oms/socket.sock"; | 5 | socket = "/run/denise_oms/socket.sock"; |
6 | in { | 6 | in { |
7 | options.myServices.websites.denise.oms.enable = lib.mkEnableOption "enable Denise's OMS website"; | 7 | 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 @@ | |||
1 | { lib, pkgs, config, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | cfg = config.myServices.websites.immae.production; | 3 | cfg = config.myServices.websites.immae.production; |
4 | varDir = "/var/lib/buildbot/outputs/immaeEu"; | 4 | varDir = "/var/lib/buildbot/outputs/immae/blog"; |
5 | coursDir = "/var/lib/buildbot/outputs/cours"; | 5 | coursDir = "/var/lib/buildbot/outputs/immae/cours"; |
6 | rechercheDir = "/var/lib/buildbot/outputs/recherche"; | 6 | rechercheDir = "/var/lib/buildbot/outputs/immae/recherche"; |
7 | recettesDir = "/var/lib/buildbot/outputs/recettes"; | 7 | recettesDir = "/var/lib/buildbot/outputs/immae/recettes"; |
8 | historyDir = "/var/lib/buildbot/outputs/immae/history"; | 8 | historyDir = "/var/lib/buildbot/outputs/immae/history"; |
9 | env = config.myEnv.websites.immae; | 9 | env = config.myEnv.websites.immae; |
10 | in { | 10 | 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 { | |||
167 | Options -Indexes | 167 | Options -Indexes |
168 | </Directory> | 168 | </Directory> |
169 | 169 | ||
170 | Alias /BIP39 /var/lib/buildbot/outputs/bip39 | 170 | Alias /BIP39 /var/lib/buildbot/outputs/immae/bip39 |
171 | <Directory "/var/lib/buildbot/outputs/bip39"> | 171 | <Directory "/var/lib/buildbot/outputs/immae/bip39"> |
172 | DirectoryIndex index.html | 172 | DirectoryIndex index.html |
173 | AllowOverride None | 173 | AllowOverride None |
174 | Require all granted | 174 | Require all granted |