diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-12-25T23·00+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2021-12-26T00·10+0000 |
| commit | 28a80e02514fe8c13e1826fda5d53f938105d600 (patch) | |
| tree | b338a8ed7650374562d3bb429f86d710a181a7b6 /ops | |
| parent | 738cca62c1c4b5297d636fc331cd49bd82eaa0a6 (diff) | |
chore: friendship ended with cas, now keycloak is our best friend r/3411
Note that the login.tvl.fyi WWW configuration is still kind of hanging around until we've settled where Keycloak lives. Change-Id: Iaca4e394a7371cafa3716ca66ef09c4eca5b1520 Reviewed-on: https://cl.tvl.fyi/c/depot/+/4626 Autosubmit: tazjin <mail@tazj.in> Tested-by: BuildkiteCI Reviewed-by: lukegb <lukegb@tvl.fyi>
Diffstat (limited to 'ops')
| -rw-r--r-- | ops/machines/whitby/default.nix | 3 | ||||
| -rw-r--r-- | ops/modules/tvl-sso/default.nix | 28 |
2 files changed, 1 insertions, 30 deletions
diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index 63d14be19898..727859542938 100644 --- a/ops/machines/whitby/default.nix +++ b/ops/machines/whitby/default.nix @@ -21,7 +21,6 @@ in { "${depot.path}/ops/modules/sourcegraph.nix" "${depot.path}/ops/modules/tvl-buildkite.nix" "${depot.path}/ops/modules/tvl-slapd/default.nix" - "${depot.path}/ops/modules/tvl-sso/default.nix" "${depot.path}/ops/modules/www/atward.tvl.fyi.nix" "${depot.path}/ops/modules/www/auth.tvl.fyi.nix" "${depot.path}/ops/modules/www/b.tvl.fyi.nix" @@ -31,7 +30,7 @@ in { "${depot.path}/ops/modules/www/cs.tvl.fyi.nix" "${depot.path}/ops/modules/www/deploys.tvl.fyi.nix" "${depot.path}/ops/modules/www/images.tvl.fyi.nix" - "${depot.path}/ops/modules/www/login.tvl.fyi.nix" + # "${depot.path}/ops/modules/www/login.tvl.fyi.nix" "${depot.path}/ops/modules/www/nixery.dev.nix" "${depot.path}/ops/modules/www/static.tvl.fyi.nix" "${depot.path}/ops/modules/www/status.tvl.su.nix" diff --git a/ops/modules/tvl-sso/default.nix b/ops/modules/tvl-sso/default.nix deleted file mode 100644 index 8b413114cc69..000000000000 --- a/ops/modules/tvl-sso/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -# Configures an Apereo CAS instance for TVL SSO -{ depot, ... }: - -let - inherit (depot.third_party) apereo-cas; -in { - config = { - environment.systemPackages = [ apereo-cas ]; - systemd.services.apereo-cas = { - description = "Apereo CAS Single Sign On server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - environment.JDK_JAVA_OPTIONS = "-Xmx512M -Xms512M"; - serviceConfig = { - User = "apereo-cas"; - Group = "apereo-cas"; - ExecStart = "${apereo-cas}/bin/cas"; - EnvironmentFile = "/etc/cas/secrets"; - Restart = "always"; - }; - }; - users.users.apereo-cas = { - isSystemUser = true; - group = "apereo-cas"; - }; - users.groups.apereo-cas = {}; - }; -} |