aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/private/buildbot/projects/caldance/__init__.py4
-rw-r--r--modules/private/system/dilion.nix8
-rw-r--r--modules/private/websites/chloe/integration.nix4
-rw-r--r--modules/private/websites/connexionswing/integration.nix4
-rw-r--r--modules/private/websites/florian/integration.nix6
-rw-r--r--modules/private/websites/isabelle/aten_integration.nix6
-rw-r--r--modules/private/websites/ludivine/integration.nix4
-rw-r--r--modules/private/websites/piedsjaloux/integration.nix4
-rw-r--r--modules/private/websites/tools/tools/default.nix4
m---------nixops/secrets0
10 files changed, 22 insertions, 22 deletions
diff --git a/modules/private/buildbot/projects/caldance/__init__.py b/modules/private/buildbot/projects/caldance/__init__.py
index c71eebf..2074d9e 100644
--- a/modules/private/buildbot/projects/caldance/__init__.py
+++ b/modules/private/buildbot/projects/caldance/__init__.py
@@ -22,7 +22,7 @@ class E():
22 XMPP_RECIPIENTS = os.environ["BUILDBOT_XMPP_RECIPIENTS"].split(" ") 22 XMPP_RECIPIENTS = os.environ["BUILDBOT_XMPP_RECIPIENTS"].split(" ")
23 23
24 PUPPET_HOST = { 24 PUPPET_HOST = {
25 "integration": [ "-p8022", "root@caldance.immae.eu"], 25 "integration": [ "-p8022", "root@caldance.cs.immae.dev"],
26 } 26 }
27 27
28 # master.cfg 28 # master.cfg
@@ -32,7 +32,7 @@ class E():
32 LDAP_BASE = "dc=immae,dc=eu" 32 LDAP_BASE = "dc=immae,dc=eu"
33 LDAP_PATTERN = "(uid=%(username)s)" 33 LDAP_PATTERN = "(uid=%(username)s)"
34 LDAP_GROUP_PATTERN = "(&(memberOf=cn=groups,ou=caldance,cn=buildbot,ou=services,dc=immae,dc=eu)(member=%(dn)s))" 34 LDAP_GROUP_PATTERN = "(&(memberOf=cn=groups,ou=caldance,cn=buildbot,ou=services,dc=immae,dc=eu)(member=%(dn)s))"
35 TITLE_URL = "https://caldance.immae.eu" 35 TITLE_URL = "https://caldance.cs.immae.dev"
36 TITLE = "Caldance" 36 TITLE = "Caldance"
37 37
38class CustomBase(webhooks.base): 38class CustomBase(webhooks.base):
diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix
index b9be8b0..fa92cd9 100644
--- a/modules/private/system/dilion.nix
+++ b/modules/private/system/dilion.nix
@@ -173,8 +173,8 @@
173 user = config.services.nginx.user; 173 user = config.services.nginx.user;
174 group = config.services.nginx.group; 174 group = config.services.nginx.group;
175 extraDomains = { 175 extraDomains = {
176 "dev.immae.eu" = null; 176 "dilion.immae.dev" = null;
177 "caldance.immae.eu" = null; 177 "caldance.cs.immae.dev" = null;
178 }; 178 };
179 }; 179 };
180 services.nginx = { 180 services.nginx = {
@@ -186,13 +186,13 @@
186 caldance.servers."caldance:3031" = {}; 186 caldance.servers."caldance:3031" = {};
187 }; 187 };
188 virtualHosts = { 188 virtualHosts = {
189 "dev.immae.eu" = { 189 "dilion.immae.dev" = {
190 acmeRoot = config.myServices.certificates.webroot; 190 acmeRoot = config.myServices.certificates.webroot;
191 useACMEHost = name; 191 useACMEHost = name;
192 forceSSL = true; 192 forceSSL = true;
193 root = "/home/immae/www"; 193 root = "/home/immae/www";
194 }; 194 };
195 "caldance.immae.eu" = { 195 "caldance.cs.immae.dev" = {
196 acmeRoot = config.myServices.certificates.webroot; 196 acmeRoot = config.myServices.certificates.webroot;
197 useACMEHost = name; 197 useACMEHost = name;
198 forceSSL = true; 198 forceSSL = true;
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix
index 4dc4bf3..533568e 100644
--- a/modules/private/websites/chloe/integration.nix
+++ b/modules/private/websites/chloe/integration.nix
@@ -60,7 +60,7 @@ in {
60 services.websites.env.integration.vhostConfs.chloe_integration = { 60 services.websites.env.integration.vhostConfs.chloe_integration = {
61 certName = "integration"; 61 certName = "integration";
62 addToCerts = true; 62 addToCerts = true;
63 hosts = ["chloe.immae.eu" ]; 63 hosts = ["test.chc.immae.dev" ];
64 root = webRoot; 64 root = webRoot;
65 extraConfig = [ 65 extraConfig = [
66 '' 66 ''
@@ -91,7 +91,7 @@ in {
91 91
92 <Location /> 92 <Location />
93 Use LDAPConnect 93 Use LDAPConnect
94 Require ldap-group cn=chloe.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu 94 Require ldap-group cn=chc.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
95 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://osteopathe-cc.fr\"></html>" 95 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://osteopathe-cc.fr\"></html>"
96 </Location> 96 </Location>
97 '' 97 ''
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix
index c1165b8..9cf2b94 100644
--- a/modules/private/websites/connexionswing/integration.nix
+++ b/modules/private/websites/connexionswing/integration.nix
@@ -68,7 +68,7 @@ in {
68 services.websites.env.integration.vhostConfs.connexionswing_integration = { 68 services.websites.env.integration.vhostConfs.connexionswing_integration = {
69 certName = "integration"; 69 certName = "integration";
70 addToCerts = true; 70 addToCerts = true;
71 hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ]; 71 hosts = ["connexionswing.cs.immae.dev" "sandetludo.cs.immae.dev" ];
72 root = webRoot; 72 root = webRoot;
73 extraConfig = [ 73 extraConfig = [
74 '' 74 ''
@@ -90,7 +90,7 @@ in {
90 90
91 <Location /> 91 <Location />
92 Use LDAPConnect 92 Use LDAPConnect
93 Require ldap-group cn=connexionswing.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu 93 Require ldap-group cn=cs.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
94 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://connexionswing.com\"></html>" 94 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://connexionswing.com\"></html>"
95 </Location> 95 </Location>
96 96
diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index 5ebe531..8ac1f46 100644
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.nix
@@ -2,19 +2,19 @@
2let 2let
3 adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; }; 3 adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
4 cfg = config.myServices.websites.florian.integration; 4 cfg = config.myServices.websites.florian.integration;
5 varDir = "/var/lib/ftp/florian/florian.immae.eu"; 5 varDir = "/var/lib/ftp/florian/www.ft.immae.dev";
6 env = config.myEnv.websites.florian; 6 env = config.myEnv.websites.florian;
7in { 7in {
8 options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration"; 8 options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration";
9 9
10 config = lib.mkIf cfg.enable { 10 config = lib.mkIf cfg.enable {
11 security.acme.certs."ftp".extraDomains."florian.immae.eu" = null; 11 security.acme.certs."ftp".extraDomains."ft.immae.dev" = null;
12 12
13 services.websites.env.integration.modules = adminer.apache.modules; 13 services.websites.env.integration.modules = adminer.apache.modules;
14 services.websites.env.integration.vhostConfs.florian_integration = { 14 services.websites.env.integration.vhostConfs.florian_integration = {
15 certName = "integration"; 15 certName = "integration";
16 addToCerts = true; 16 addToCerts = true;
17 hosts = [ "florian.immae.eu" ]; 17 hosts = [ "www.ft.immae.dev" ];
18 root = varDir; 18 root = varDir;
19 extraConfig = [ 19 extraConfig = [
20 (adminer.apache.vhostConf null) 20 (adminer.apache.vhostConf null)
diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix
index 215038e..c55ef92 100644
--- a/modules/private/websites/isabelle/aten_integration.nix
+++ b/modules/private/websites/isabelle/aten_integration.nix
@@ -55,7 +55,7 @@ in {
55 services.websites.env.integration.vhostConfs.isabelle_aten_integration = { 55 services.websites.env.integration.vhostConfs.isabelle_aten_integration = {
56 certName = "integration"; 56 certName = "integration";
57 addToCerts = true; 57 addToCerts = true;
58 hosts = [ "dev.aten.pro" ]; 58 hosts = [ "aten.ic.immae.dev" ];
59 root = webRoot; 59 root = webRoot;
60 extraConfig = [ 60 extraConfig = [
61 '' 61 ''
@@ -67,13 +67,13 @@ in {
67 67
68 <Location /> 68 <Location />
69 Use LDAPConnect 69 Use LDAPConnect
70 Require ldap-group cn=dev.aten.pro,cn=httpd,ou=services,dc=immae,dc=eu 70 Require ldap-group cn=ic.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
71 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>" 71 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>"
72 </Location> 72 </Location>
73 73
74 <Location /backend> 74 <Location /backend>
75 Use LDAPConnect 75 Use LDAPConnect
76 Require ldap-group cn=dev.aten.pro,cn=httpd,ou=services,dc=immae,dc=eu 76 Require ldap-group cn=ic.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
77 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>" 77 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>"
78 </Location> 78 </Location>
79 79
diff --git a/modules/private/websites/ludivine/integration.nix b/modules/private/websites/ludivine/integration.nix
index c0cbbef..49aa113 100644
--- a/modules/private/websites/ludivine/integration.nix
+++ b/modules/private/websites/ludivine/integration.nix
@@ -84,7 +84,7 @@ in {
84 services.websites.env.integration.vhostConfs.ludivine_integration = { 84 services.websites.env.integration.vhostConfs.ludivine_integration = {
85 certName = "integration"; 85 certName = "integration";
86 addToCerts = true; 86 addToCerts = true;
87 hosts = [ "ludivine.immae.eu" ]; 87 hosts = [ "test.lc.immae.dev" ];
88 root = webRoot; 88 root = webRoot;
89 extraConfig = [ 89 extraConfig = [
90 '' 90 ''
@@ -94,7 +94,7 @@ in {
94 94
95 <Location /> 95 <Location />
96 Use LDAPConnect 96 Use LDAPConnect
97 Require ldap-group cn=ludivine.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu 97 Require ldap-group cn=lc.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
98 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://ludivinecassal.com\"></html>" 98 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://ludivinecassal.com\"></html>"
99 </Location> 99 </Location>
100 100
diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix
index d103ad7..3502964 100644
--- a/modules/private/websites/piedsjaloux/integration.nix
+++ b/modules/private/websites/piedsjaloux/integration.nix
@@ -74,7 +74,7 @@ in {
74 services.websites.env.integration.vhostConfs.piedsjaloux_integration = { 74 services.websites.env.integration.vhostConfs.piedsjaloux_integration = {
75 certName = "integration"; 75 certName = "integration";
76 addToCerts = true; 76 addToCerts = true;
77 hosts = [ "piedsjaloux.immae.eu" ]; 77 hosts = [ "test.pj.immae.dev" ];
78 root = webRoot; 78 root = webRoot;
79 extraConfig = [ 79 extraConfig = [
80 '' 80 ''
@@ -84,7 +84,7 @@ in {
84 84
85 <Location /> 85 <Location />
86 Use LDAPConnect 86 Use LDAPConnect
87 Require ldap-group cn=piedsjaloux.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu 87 Require ldap-group cn=pj.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
88 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://piedsjaloux.fr\"></html>" 88 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://piedsjaloux.fr\"></html>"
89 </Location> 89 </Location>
90 90
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 77d6323..90fcbe1 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -107,9 +107,9 @@ in {
107 107
108 services.websites.env.integration.vhostConfs.devtools = { 108 services.websites.env.integration.vhostConfs.devtools = {
109 certName = "integration"; 109 certName = "integration";
110 certMainHost = "devtools.immae.eu"; 110 certMainHost = "tools.immae.dev";
111 addToCerts = true; 111 addToCerts = true;
112 hosts = [ "devtools.immae.eu" ]; 112 hosts = [ "tools.immae.dev" ];
113 root = "/var/lib/ftp/immae/devtools"; 113 root = "/var/lib/ftp/immae/devtools";
114 extraConfig = [ 114 extraConfig = [
115 '' 115 ''
diff --git a/nixops/secrets b/nixops/secrets
Subproject 39f3c2c33c57df2a502b3cdf45635d0afe27273 Subproject 8c6277e3c2762e13d5f1f2ac06d2e815e02fab8
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 10:38:51 +0000