]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
projects / perso / Immae / Config / Nix.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5315b43)
Use immae.dev domain
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Fri, 22 Oct 2021 20:21:15 +0000 (22:21 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Fri, 22 Oct 2021 23:48:17 +0000 (01:48 +0200)
modules/private/buildbot/projects/caldance/__init__.py patch | blob | blame | history
modules/private/system/dilion.nix patch | blob | blame | history
modules/private/websites/chloe/integration.nix patch | blob | blame | history
modules/private/websites/connexionswing/integration.nix patch | blob | blame | history
modules/private/websites/florian/integration.nix patch | blob | blame | history
modules/private/websites/isabelle/aten_integration.nix patch | blob | blame | history
modules/private/websites/ludivine/integration.nix patch | blob | blame | history
modules/private/websites/piedsjaloux/integration.nix patch | blob | blame | history
modules/private/websites/tools/tools/default.nix patch | blob | blame | history
nixops/secrets patch | blob | blame | history

diff --git a/modules/private/buildbot/projects/caldance/__init__.py b/modules/private/buildbot/projects/caldance/__init__.py
index c71eebf923529eec8efdbae9dd5f2bc483f29725..2074d9e911d026550aec9303f1764fc431864263 100644 (file)
--- a/modules/private/buildbot/projects/caldance/__init__.py
+++ b/modules/private/buildbot/projects/caldance/__init__.py
@@ -22,7 +22,7 @@ class E():
     XMPP_RECIPIENTS = os.environ["BUILDBOT_XMPP_RECIPIENTS"].split(" ")
 
     PUPPET_HOST = {
-            "integration": [ "-p8022", "root@caldance.immae.eu"],
+            "integration": [ "-p8022", "root@caldance.cs.immae.dev"],
             }
 
     # master.cfg
@@ -32,7 +32,7 @@ class E():
     LDAP_BASE          = "dc=immae,dc=eu"
     LDAP_PATTERN       = "(uid=%(username)s)"
     LDAP_GROUP_PATTERN = "(&(memberOf=cn=groups,ou=caldance,cn=buildbot,ou=services,dc=immae,dc=eu)(member=%(dn)s))"
-    TITLE_URL          = "https://caldance.immae.eu"
+    TITLE_URL          = "https://caldance.cs.immae.dev"
     TITLE              = "Caldance"
 
 class CustomBase(webhooks.base):
diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix
index b9be8b073430b7e7019526b099d5bb3fcf5684f9..fa92cd98a96bc1ccfad58ce56c42c6962a8cbf23 100644 (file)
--- a/modules/private/system/dilion.nix
+++ b/modules/private/system/dilion.nix
@@ -173,8 +173,8 @@
     user = config.services.nginx.user;
     group = config.services.nginx.group;
     extraDomains = {
-      "dev.immae.eu" = null;
-      "caldance.immae.eu" = null;
+      "dilion.immae.dev" = null;
+      "caldance.cs.immae.dev" = null;
     };
   };
   services.nginx = {
@@ -186,13 +186,13 @@
       caldance.servers."caldance:3031" = {};
     };
     virtualHosts = {
-      "dev.immae.eu" = {
+      "dilion.immae.dev" = {
         acmeRoot = config.myServices.certificates.webroot;
         useACMEHost = name;
         forceSSL = true;
         root = "/home/immae/www";
       };
-      "caldance.immae.eu" = {
+      "caldance.cs.immae.dev" = {
         acmeRoot = config.myServices.certificates.webroot;
         useACMEHost = name;
         forceSSL = true;
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix
index 4dc4bf3ffdc6b44f72722f6982f27ad18e8dd44b..533568ebd108a57db511d52acb9e7eb1a7a329e3 100644 (file)
--- a/modules/private/websites/chloe/integration.nix
+++ b/modules/private/websites/chloe/integration.nix
@@ -60,7 +60,7 @@ in {
     services.websites.env.integration.vhostConfs.chloe_integration = {
       certName    = "integration";
       addToCerts  = true;
-      hosts       = ["chloe.immae.eu" ];
+      hosts       = ["test.chc.immae.dev" ];
       root        = webRoot;
       extraConfig = [
       ''
@@ -91,7 +91,7 @@ in {
 
         <Location />
           Use LDAPConnect
-          Require ldap-group cn=chloe.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu
+          Require ldap-group cn=chc.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
           ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://osteopathe-cc.fr\"></html>"
         </Location>
         ''
diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix
index c1165b8b846e82cd237d189e388364661643210d..9cf2b94c6ec38f53f9455b2c4b4319e727ae9be3 100644 (file)
--- a/modules/private/websites/connexionswing/integration.nix
+++ b/modules/private/websites/connexionswing/integration.nix
@@ -68,7 +68,7 @@ in {
     services.websites.env.integration.vhostConfs.connexionswing_integration = {
       certName    = "integration";
       addToCerts  = true;
-      hosts       = ["connexionswing.immae.eu" "sandetludo.immae.eu" ];
+      hosts       = ["connexionswing.cs.immae.dev" "sandetludo.cs.immae.dev" ];
       root        = webRoot;
       extraConfig = [
         ''
@@ -90,7 +90,7 @@ in {
 
         <Location />
           Use LDAPConnect
-          Require ldap-group   cn=connexionswing.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu
+          Require ldap-group   cn=cs.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
           ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://connexionswing.com\"></html>"
         </Location>
 
diff --git a/modules/private/websites/florian/integration.nix b/modules/private/websites/florian/integration.nix
index 5ebe53148f014c6c9c84c8f27f60d98776042509..8ac1f46eb14e4299433ed4c00ed509aa0528e495 100644 (file)
--- a/modules/private/websites/florian/integration.nix
+++ b/modules/private/websites/florian/integration.nix
@@ -2,19 +2,19 @@
 let
   adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
   cfg = config.myServices.websites.florian.integration;
-  varDir = "/var/lib/ftp/florian/florian.immae.eu";
+  varDir = "/var/lib/ftp/florian/www.ft.immae.dev";
   env = config.myEnv.websites.florian;
 in {
   options.myServices.websites.florian.integration.enable = lib.mkEnableOption "enable Florian's website integration";
 
   config = lib.mkIf cfg.enable {
-    security.acme.certs."ftp".extraDomains."florian.immae.eu" = null;
+    security.acme.certs."ftp".extraDomains."ft.immae.dev" = null;
 
     services.websites.env.integration.modules = adminer.apache.modules;
     services.websites.env.integration.vhostConfs.florian_integration = {
       certName    = "integration";
       addToCerts  = true;
-      hosts       = [ "florian.immae.eu" ];
+      hosts       = [ "www.ft.immae.dev" ];
       root        = varDir;
       extraConfig = [
         (adminer.apache.vhostConf null)
diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix
index 215038e182336e97a16d900d742362d553ef43be..c55ef929b202683fc7a660632ba2f6191e3024d8 100644 (file)
--- a/modules/private/websites/isabelle/aten_integration.nix
+++ b/modules/private/websites/isabelle/aten_integration.nix
@@ -55,7 +55,7 @@ in {
     services.websites.env.integration.vhostConfs.isabelle_aten_integration = {
       certName    = "integration";
       addToCerts  = true;
-      hosts       = [ "dev.aten.pro" ];
+      hosts       = [ "aten.ic.immae.dev" ];
       root        = webRoot;
       extraConfig = [
         ''
@@ -67,13 +67,13 @@ in {
 
         <Location />
           Use LDAPConnect
-          Require ldap-group   cn=dev.aten.pro,cn=httpd,ou=services,dc=immae,dc=eu
+          Require ldap-group   cn=ic.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
           ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>"
         </Location>
 
         <Location /backend>
           Use LDAPConnect
-          Require ldap-group   cn=dev.aten.pro,cn=httpd,ou=services,dc=immae,dc=eu
+          Require ldap-group   cn=ic.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
           ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>"
         </Location>
 
diff --git a/modules/private/websites/ludivine/integration.nix b/modules/private/websites/ludivine/integration.nix
index c0cbbef77caa60201159ae43cf2a385a708b0f9a..49aa11350625f6023dde7bde40d8fa3aa4f8a530 100644 (file)
--- a/modules/private/websites/ludivine/integration.nix
+++ b/modules/private/websites/ludivine/integration.nix
@@ -84,7 +84,7 @@ in {
     services.websites.env.integration.vhostConfs.ludivine_integration = {
       certName    = "integration";
       addToCerts  = true;
-      hosts       = [ "ludivine.immae.eu" ];
+      hosts       = [ "test.lc.immae.dev" ];
       root        = webRoot;
       extraConfig = [
         ''
@@ -94,7 +94,7 @@ in {
 
         <Location />
           Use LDAPConnect
-          Require ldap-group   cn=ludivine.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu
+          Require ldap-group   cn=lc.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
           ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://ludivinecassal.com\"></html>"
         </Location>
 
diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix
index d103ad7a56f5d481b8c2d983e6fa2953c46da6e5..3502964f19aef2af5008e0d88248231d06d5ea2c 100644 (file)
--- a/modules/private/websites/piedsjaloux/integration.nix
+++ b/modules/private/websites/piedsjaloux/integration.nix
@@ -74,7 +74,7 @@ in {
     services.websites.env.integration.vhostConfs.piedsjaloux_integration = {
       certName     = "integration";
       addToCerts  = true;
-      hosts       = [ "piedsjaloux.immae.eu" ];
+      hosts       = [ "test.pj.immae.dev" ];
       root        = webRoot;
       extraConfig = [
         ''
@@ -84,7 +84,7 @@ in {
 
         <Location />
           Use LDAPConnect
-          Require ldap-group   cn=piedsjaloux.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu
+          Require ldap-group   cn=pj.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu
           ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://piedsjaloux.fr\"></html>"
         </Location>
 
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 77d6323a140c2075bf8fb524782ffac1f9899402..90fcbe1ff11cd0f1ca3718af9bb8cd981573de7d 100644 (file)
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -107,9 +107,9 @@ in {
 
     services.websites.env.integration.vhostConfs.devtools = {
       certName     = "integration";
-      certMainHost = "devtools.immae.eu";
+      certMainHost = "tools.immae.dev";
       addToCerts   = true;
-      hosts        = [ "devtools.immae.eu" ];
+      hosts        = [ "tools.immae.dev" ];
       root         = "/var/lib/ftp/immae/devtools";
       extraConfig  = [
         ''
diff --git a/nixops/secrets b/nixops/secrets
index 39f3c2c33c57df2a502b3cdf45635d0afe272739..8c6277e3c2762e13d5f1f2ac06d2e815e02fab82 160000 (submodule)
--- a/nixops/secrets
+++ b/nixops/secrets
@@ -1 +1 @@
-Subproject commit 39f3c2c33c57df2a502b3cdf45635d0afe272739
+Subproject commit 8c6277e3c2762e13d5f1f2ac06d2e815e02fab82
My infrastructure configuration