From 7c5e6fe8b639e3175798c097170a0b94ca7326b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 22 Oct 2021 22:21:15 +0200 Subject: [PATCH] Use immae.dev domain --- modules/private/buildbot/projects/caldance/__init__.py | 4 ++-- modules/private/system/dilion.nix | 8 ++++---- modules/private/websites/chloe/integration.nix | 4 ++-- modules/private/websites/connexionswing/integration.nix | 4 ++-- modules/private/websites/florian/integration.nix | 6 +++--- modules/private/websites/isabelle/aten_integration.nix | 6 +++--- modules/private/websites/ludivine/integration.nix | 4 ++-- modules/private/websites/piedsjaloux/integration.nix | 4 ++-- modules/private/websites/tools/tools/default.nix | 4 ++-- nixops/secrets | 2 +- 10 files changed, 23 insertions(+), 23 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(): 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 b9be8b0..fa92cd9 100644 --- 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 4dc4bf3..533568e 100644 --- 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 { 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 "" '' 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 { 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 { 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 "" 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 @@ 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 215038e..c55ef92 100644 --- 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 { 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 "" 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 "" 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 { 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 { 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 "" 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 { 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 { 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 "" 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 { 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 39f3c2c..8c6277e 160000 --- a/nixops/secrets +++ b/nixops/secrets @@ -1 +1 @@ -Subproject commit 39f3c2c33c57df2a502b3cdf45635d0afe272739 +Subproject commit 8c6277e3c2762e13d5f1f2ac06d2e815e02fab82 -- 2.41.0