aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorADRN <adrien@luxeylab.net>2024-04-18 19:36:32 +0200
committerADRN <adrien@luxeylab.net>2024-04-18 19:36:32 +0200
commitd817ad7b1503758ed1e04187020dbe45aad9c367 (patch)
tree2f23c9f86ec06ed17e3b8d267fd609c6d100051f
parent18e73b18f39ea19bae54fb4fae461e6c141b49ce (diff)
parent1871f7bbff4c3cdf7654f7d17237480788c6356a (diff)
downloadnixcfg-d817ad7b1503758ed1e04187020dbe45aad9c367.tar.gz
nixcfg-d817ad7b1503758ed1e04187020dbe45aad9c367.zip
Merge branch 'poil'
-rw-r--r--cluster/prod/app/cryptpad/config/config.js4
-rw-r--r--cluster/prod/app/cryptpad/deploy/cryptpad.hcl4
2 files changed, 5 insertions, 3 deletions
diff --git a/cluster/prod/app/cryptpad/config/config.js b/cluster/prod/app/cryptpad/config/config.js
index 6b16996..40f5a58 100644
--- a/cluster/prod/app/cryptpad/config/config.js
+++ b/cluster/prod/app/cryptpad/config/config.js
@@ -114,7 +114,9 @@ module.exports = {
adminKeys: [
"[quentin@pad.deuxfleurs.fr/EWtzm-CiqJnM9RZL9mj-YyTgAtX-Zh76sru1K5bFpN8=]",
"[adrn@pad.deuxfleurs.fr/PxDpkPwd-jDJWkfWdAzFX7wtnLpnPlBeYZ4MmoEYS6E=]",
- "[lx@pad.deuxfleurs.fr/FwQzcXywx1FIb83z6COB7c3sHnz8rNSDX1xhjPuH3Fg=]"
+ "[lx@pad.deuxfleurs.fr/FwQzcXywx1FIb83z6COB7c3sHnz8rNSDX1xhjPuH3Fg=]",
+ "[trinity-1686a@pad.deuxfleurs.fr/Pu6Ef03jEsAGBbZI6IOdKd6+5pORD5N51QIYt4-Ys1c=]",
+ "[Jill@pad.deuxfleurs.fr/tLW7W8EVNB2KYETXEaOYR+HmNiBQtZj7u+SOxS3hGmg=]"
],
/* =====================
diff --git a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
index bec260d..6d5a335 100644
--- a/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
+++ b/cluster/prod/app/cryptpad/deploy/cryptpad.hcl
@@ -1,5 +1,5 @@
job "cryptpad" {
- datacenters = ["neptune"]
+ datacenters = ["scorpio"]
type = "service"
group "cryptpad" {
@@ -22,7 +22,7 @@ job "cryptpad" {
constraint {
attribute = "${attr.unique.hostname}"
operator = "="
- value = "concombre"
+ value = "abricot"
}
config {