Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

account: update the address used for authentication

Browse source
This commit is contained in:
silver 2023-08-06 19:00:02 +01:00
parent ce0155d6ab
commit acb49a2eb1
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ITD_Firewall.csv
View file

@ -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 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 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 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 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 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 SKYNET00010,wheatly,193.1.99.78,wheatly,"","","",Gitlab Runner

1 Index Name IP_Address DNS_Name Ports_Current Ports_Requested Related_Tickets Description
5 SKYNET00004 vigil 193.1.99.109 vigil/ns2 53 DNS Nameserver 2
6 SKYNET00005 galatea 193.1.99.111 galatea/stream 80/443 8000 ULFM Radio
7 SKYNET00006 optimus 193.1.99.112 optimus/games/*.games 80/443 25565 Games server
8 SKYNET00007 kitt 193.1.99.74 kitt/sso/api.sso kitt/account/api.account 80/443 i23-07-28_010 LDAP and Self-Service Password/Account management
9 SKYNET00008 glados 193.1.99.75 glados/gitlab/*.pages.gitlab 80/443 2222 i23-05-18_249 Gitlab server
10 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
11 SKYNET00010 wheatly 193.1.99.78 wheatly Gitlab Runner

2
applications/acme.nix
View file

@ -22,7 +22,7 @@
"*.skynet.ie" "*.skynet.ie"
"*.minecraft.games.skynet.ie" "*.minecraft.games.skynet.ie"
"*.pages.skynet.ie" "*.pages.skynet.ie"
"api.sso.skynet.ie" "api.account.skynet.ie"
]; ];
}; };
}; };

4
applications/email.nix
View file

@ -63,7 +63,7 @@
hosts = mkOption { hosts = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ default = [
"ldaps://sso.skynet.ie" "ldaps://account.skynet.ie"
]; ];
description = lib.mdDoc "ldap domains"; description = lib.mdDoc "ldap domains";
}; };
@ -157,7 +157,7 @@
$config['login_username_filter'] = "email"; $config['login_username_filter'] = "email";
$config['ldap_public']['public'] = array( $config['ldap_public']['public'] = array(
'name' => 'Public LDAP Addressbook', 'name' => 'Public LDAP Addressbook',
'hosts' => 'tls://sso.skynet.ie', 'hosts' => 'tls://account.skynet.ie',
'port' => 636 , 'port' => 636 ,
'user_specific' => false, 'user_specific' => false,
'base_dn' => 'ou=users,dc=skynet,dc=ie', 'base_dn' => 'ou=users,dc=skynet,dc=ie',

2
applications/gitlab.nix
View file

@ -179,7 +179,7 @@
servers = { servers = {
main = { main = {
label = "Skynet"; label = "Skynet";
host = "sso.skynet.ie"; host = "account.skynet.ie";
port = 636; port = 636;
uid = "uid"; uid = "uid";
encryption = "simple_tls"; encryption = "simple_tls";

2
applications/ldap.nix
View file

@ -45,7 +45,7 @@ Gonna use a priper nixos module for this
sub = mkOption { sub = mkOption {
type = types.str; type = types.str;
default = "sso"; default = "account";
}; };
}; };

6
applications/ldap/ldap_backend.nix
View file

@ -38,7 +38,7 @@
sub = mkOption { sub = mkOption {
type = types.str; type = types.str;
default = "api.sso"; default = "api.account";
}; };
}; };
}; };
@ -59,7 +59,7 @@
locations."/".proxyPass = "http://localhost:${port_backend}"; locations."/".proxyPass = "http://localhost:${port_backend}";
extraConfig = '' 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; envFile = config.age.secrets.ldap_self_service.path;
ldap = { ldap = {
host = "ldaps://sso.skynet.ie"; host = "ldaps://account.skynet.ie";
admin = "uid=ldap_api,ou=users,dc=skynet,dc=ie"; admin = "uid=ldap_api,ou=users,dc=skynet,dc=ie";
}; };

2
applications/ldap_client.nix
View file

@ -29,7 +29,7 @@
address = mkOption { address = mkOption {
type = types.str; type = types.str;
default = "sso.skynet.ie"; default = "account.skynet.ie";
description = lib.mdDoc "The domain the ldap is behind"; description = lib.mdDoc "The domain the ldap is behind";
}; };

2
flake.nix
View file

@ -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/nixos-23.05";
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; 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_backend.url = "gitlab:compsoc1%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie";
skynet_ldap_frontend.url = "gitlab:compsoc1%2Fskynet%2Fldap/frontend?host=gitlab.skynet.ie"; skynet_ldap_frontend.url = "gitlab:compsoc1%2Fskynet%2Fldap/frontend?host=gitlab.skynet.ie";