From acb49a2eb167e269a5dbbc71e6fc38da91a9ed76 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Sun, 6 Aug 2023 19:00:02 +0100
Subject: [PATCH] account: update the address used for authentication

---
 ITD_Firewall.csv                   | 2 +-
 applications/acme.nix              | 2 +-
 applications/email.nix             | 4 ++--
 applications/gitlab.nix            | 2 +-
 applications/ldap.nix              | 2 +-
 applications/ldap/ldap_backend.nix | 6 +++---
 applications/ldap_client.nix       | 2 +-
 flake.nix                          | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ITD_Firewall.csv b/ITD_Firewall.csv
index 030dcdb..8e256af 100644
--- a/ITD_Firewall.csv
+++ b/ITD_Firewall.csv
@@ -5,7 +5,7 @@ SKYNET00003,jarvis,193.1.99.73,jarvis,"","","",VM Host
 SKYNET00004,vigil,193.1.99.109,vigil/ns2,53,"","",DNS Nameserver 2
 SKYNET00005,galatea,193.1.99.111,galatea/stream,80/443 8000,"","",ULFM Radio
 SKYNET00006,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,"","",Games server
-SKYNET00007,kitt,193.1.99.74,kitt/sso/api.sso,"",80/443,i23-07-28_010,LDAP and Self-Service Password/Account management
+SKYNET00007,kitt,193.1.99.74,kitt/account/api.account,"",80/443,i23-07-28_010,LDAP and Self-Service Password/Account management
 SKYNET00008,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,2222,i23-05-18_249,Gitlab server
 SKYNET00009,gir,193.1.99.76,gir/mail,80/443 25/143/993/587/465,"",i23-06-19_525/i23-06-19_525,Email and Webmail
 SKYNET00010,wheatly,193.1.99.78,wheatly,"","","",Gitlab Runner
diff --git a/applications/acme.nix b/applications/acme.nix
index 9efbe68..103a639 100644
--- a/applications/acme.nix
+++ b/applications/acme.nix
@@ -22,7 +22,7 @@
           "*.skynet.ie"
           "*.minecraft.games.skynet.ie"
           "*.pages.skynet.ie"
-          "api.sso.skynet.ie"
+          "api.account.skynet.ie"
         ];
       };
     };
diff --git a/applications/email.nix b/applications/email.nix
index 99f8770..b69cb58 100644
--- a/applications/email.nix
+++ b/applications/email.nix
@@ -63,7 +63,7 @@
       hosts = mkOption {
         type = types.listOf types.str;
         default = [
-          "ldaps://sso.skynet.ie"
+          "ldaps://account.skynet.ie"
         ];
         description = lib.mdDoc "ldap domains";
       };
@@ -157,7 +157,7 @@
         $config['login_username_filter'] = "email";
         $config['ldap_public']['public'] = array(
           'name'              => 'Public LDAP Addressbook',
-          'hosts'             => 'tls://sso.skynet.ie',
+          'hosts'             => 'tls://account.skynet.ie',
           'port'              => 636 ,
           'user_specific'     => false,
           'base_dn'           => 'ou=users,dc=skynet,dc=ie',
diff --git a/applications/gitlab.nix b/applications/gitlab.nix
index 73850ac..32ca33f 100644
--- a/applications/gitlab.nix
+++ b/applications/gitlab.nix
@@ -179,7 +179,7 @@
           servers = {
             main = {
               label = "Skynet";
-              host = "sso.skynet.ie";
+              host = "account.skynet.ie";
               port = 636;
               uid = "uid";
               encryption = "simple_tls";
diff --git a/applications/ldap.nix b/applications/ldap.nix
index a5a162c..ff1ccc0 100644
--- a/applications/ldap.nix
+++ b/applications/ldap.nix
@@ -45,7 +45,7 @@ Gonna use a priper nixos module for this
 
       sub = mkOption {
         type = types.str;
-        default = "sso";
+        default = "account";
       };
     };
 
diff --git a/applications/ldap/ldap_backend.nix b/applications/ldap/ldap_backend.nix
index 9fc7e52..e68eb3d 100644
--- a/applications/ldap/ldap_backend.nix
+++ b/applications/ldap/ldap_backend.nix
@@ -38,7 +38,7 @@
 
       sub = mkOption {
         type = types.str;
-        default = "api.sso";
+        default = "api.account";
       };
     };
   };
@@ -59,7 +59,7 @@
       locations."/".proxyPass = "http://localhost:${port_backend}";
 
       extraConfig = ''
-        add_header Access-Control-Allow-Origin "https://sso.${cfg.domain.base}.${cfg.domain.tld}";
+        add_header Access-Control-Allow-Origin "https://account.${cfg.domain.base}.${cfg.domain.tld}";
       '';
     };
 
@@ -70,7 +70,7 @@
       envFile = config.age.secrets.ldap_self_service.path;
 
       ldap  = {
-        host = "ldaps://sso.skynet.ie";
+        host = "ldaps://account.skynet.ie";
         admin = "uid=ldap_api,ou=users,dc=skynet,dc=ie";
       };
 
diff --git a/applications/ldap_client.nix b/applications/ldap_client.nix
index 395f5ae..2a7324a 100644
--- a/applications/ldap_client.nix
+++ b/applications/ldap_client.nix
@@ -29,7 +29,7 @@
 
     address = mkOption {
       type = types.str;
-      default = "sso.skynet.ie";
+      default = "account.skynet.ie";
       description = lib.mdDoc "The domain the ldap is behind";
     };
 
diff --git a/flake.nix b/flake.nix
index f165aef..df382ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
     # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
 
-    # sso.skynet.ie
+    # account.skynet.ie
     skynet_ldap_backend.url  = "gitlab:compsoc1%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie";
     skynet_ldap_frontend.url = "gitlab:compsoc1%2Fskynet%2Fldap/frontend?host=gitlab.skynet.ie";