From 557f735a79497d07fc921fae0e92303b1a48ab94 Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 21 Sep 2022 15:35:13 +0200 Subject: [PATCH] remove authentik --- .../apps/authentik/external-secret.yaml | 17 ------- flux/cluster/apps/authentik/helm-release.yaml | 47 ------------------- .../cluster/apps/authentik/kustomization.yaml | 5 -- flux/cluster/apps/kustomization.yaml | 1 - .../charts/helm/authentik-charts.yaml | 10 ---- .../charts/helm/kustomization.yaml | 1 - flux/cluster/core/namespaces/authentik.yaml | 7 --- .../core/namespaces/kustomization.yaml | 1 - .../hosts/olympus/database/configuration.nix | 2 +- .../hosts/olympus/hedgedoc/configuration.nix | 14 ------ nixos/hosts/thalassa/null/home/default.nix | 14 ++++++ 11 files changed, 15 insertions(+), 104 deletions(-) delete mode 100644 flux/cluster/apps/authentik/external-secret.yaml delete mode 100644 flux/cluster/apps/authentik/helm-release.yaml delete mode 100644 flux/cluster/apps/authentik/kustomization.yaml delete mode 100644 flux/cluster/base/flux-system/charts/helm/authentik-charts.yaml delete mode 100644 flux/cluster/core/namespaces/authentik.yaml diff --git a/flux/cluster/apps/authentik/external-secret.yaml b/flux/cluster/apps/authentik/external-secret.yaml deleted file mode 100644 index a7789af..0000000 --- a/flux/cluster/apps/authentik/external-secret.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: authentik - namespace: authentik -spec: - refreshInterval: "5m" - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: authentik - data: - - secretKey: secret_key - remoteRef: - key: authentik/authentik - property: secret_key diff --git a/flux/cluster/apps/authentik/helm-release.yaml b/flux/cluster/apps/authentik/helm-release.yaml deleted file mode 100644 index c21a481..0000000 --- a/flux/cluster/apps/authentik/helm-release.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: authentik - namespace: authentik -spec: - interval: 1m0s - chart: - spec: - # renovate: registryUrl=https://charts.goauthentik.io - chart: authentik - version: 2022.7.3 - sourceRef: - kind: HelmRepository - name: authentik-charts - namespace: flux-system - interval: 5m - valuesFrom: - - kind: Secret - name: authentik - valuesKey: secret_key - targetPath: authentik.secret_key - optional: false - values: - image: - repository: ghcr.io/goauthentik/server - tag: 2022.7.3 - authentik: - error_reporting: - enabled: true - postgresql: - host: "database.olympus" - name: "authentik" - user: "authentik" - redis: - enabled: true - architecture: standalone - auth: - enabled: false - ingress: - enabled: true - ingressClassName: "traefik" - hosts: - - host: id.0x76.dev - paths: - - path: "/" - pathType: Prefix diff --git a/flux/cluster/apps/authentik/kustomization.yaml b/flux/cluster/apps/authentik/kustomization.yaml deleted file mode 100644 index 9a89122..0000000 --- a/flux/cluster/apps/authentik/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - external-secret.yaml - - helm-release.yaml diff --git a/flux/cluster/apps/kustomization.yaml b/flux/cluster/apps/kustomization.yaml index 05bf7ef..8802a6a 100644 --- a/flux/cluster/apps/kustomization.yaml +++ b/flux/cluster/apps/kustomization.yaml @@ -3,7 +3,6 @@ kind: Kustomization resources: - networking - presidential-paradise - - authentik - gitops - monitoring - olympus diff --git a/flux/cluster/base/flux-system/charts/helm/authentik-charts.yaml b/flux/cluster/base/flux-system/charts/helm/authentik-charts.yaml deleted file mode 100644 index 6366bd7..0000000 --- a/flux/cluster/base/flux-system/charts/helm/authentik-charts.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: authentik-charts - namespace: flux-system -spec: - interval: 15m - url: https://charts.goauthentik.io/ - timeout: 3m diff --git a/flux/cluster/base/flux-system/charts/helm/kustomization.yaml b/flux/cluster/base/flux-system/charts/helm/kustomization.yaml index 462fbd7..c8afccd 100644 --- a/flux/cluster/base/flux-system/charts/helm/kustomization.yaml +++ b/flux/cluster/base/flux-system/charts/helm/kustomization.yaml @@ -4,6 +4,5 @@ resources: - metallb-charts.yaml - traefik-charts.yaml - external-secrets-charts.yaml - - authentik-charts.yaml - fairwinds-charts.yaml - drone-charts.yaml diff --git a/flux/cluster/core/namespaces/authentik.yaml b/flux/cluster/core/namespaces/authentik.yaml deleted file mode 100644 index 511463c..0000000 --- a/flux/cluster/core/namespaces/authentik.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: authentik - labels: - goldilocks.fairwinds.com/enabled: "true" diff --git a/flux/cluster/core/namespaces/kustomization.yaml b/flux/cluster/core/namespaces/kustomization.yaml index 0dfe9d5..baf9585 100644 --- a/flux/cluster/core/namespaces/kustomization.yaml +++ b/flux/cluster/core/namespaces/kustomization.yaml @@ -4,7 +4,6 @@ resources: - presidential-paradise.yaml - networking.yaml - external-secrets.yaml - - authentik.yaml - gitops.yaml - monitoring.yaml - olympus.yaml diff --git a/nixos/hosts/olympus/database/configuration.nix b/nixos/hosts/olympus/database/configuration.nix index 7fb8861..967a111 100644 --- a/nixos/hosts/olympus/database/configuration.nix +++ b/nixos/hosts/olympus/database/configuration.nix @@ -4,7 +4,7 @@ { config, pkgs, ... }: let - databases = [ "authentik" "umami" "drone" ]; + databases = [ "umami" "drone" ]; in { imports = [ ]; diff --git a/nixos/hosts/olympus/hedgedoc/configuration.nix b/nixos/hosts/olympus/hedgedoc/configuration.nix index 3856ad0..21c8a5c 100644 --- a/nixos/hosts/olympus/hedgedoc/configuration.nix +++ b/nixos/hosts/olympus/hedgedoc/configuration.nix @@ -76,20 +76,6 @@ in secretKey = "$MINIO_SECRET_KEY"; }; email = true; - # Disable until fixed - # oauth2 = let url = "https://id.0x76.dev"; in - # { - # providerName = "authentik"; - # clientID = "$AUTHENTIK_CLIENTID"; - # clientSecret = "$AUTHENTIK_CLIENTSECRET"; - # scope = "openid email profile"; - # userProfileURL = "${url}/application/o/userinfo/"; - # tokenURL = "${url}/application/o/token/"; - # authorizationURL = "${url}/application/o/authorize/"; - # userProfileUsernameAttr = "preferred_username"; - # userProfileDisplayNameAttr = "name"; - # userProfileEmailAttr = "email"; - # }; }; }; } diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 8c937e1..0115bf5 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -121,5 +121,19 @@ }; }; + xdg.userDirs = let home = config.home.homeDirectory; in + { + enable = true; + createDirectories = true; + desktop = "${home}/.desktop"; + documents = "${home}/cloud/Documents"; + download = "${home}/dl"; + music = "${home}/cloud/Music"; + pictures = "${home}/cloud/Pictures"; + publicShare = "${home}/.publicShare"; + templates = "${home}/.templates"; + videos = "${home}/cloud/Videos"; + }; + services.syncthing.enable = true; }