Compare commits
9 commits
5157a57f32
...
9b819a2a58
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b819a2a58 | ||
|
|
f33f05a5b6 | ||
| 01f9340cfb | |||
| 15103b16ba | |||
|
|
138bb67ffb | ||
| b11ca6bd05 | |||
| eac33f7cef | |||
| 7edfdf92e0 | |||
| 7b9e07ee4b |
7 changed files with 332 additions and 73 deletions
|
|
@ -5,5 +5,6 @@
|
||||||
ls -1 ../systems/x86_64-linux/
|
ls -1 ../systems/x86_64-linux/
|
||||||
|
|
||||||
[doc('Update the target machine')]
|
[doc('Update the target machine')]
|
||||||
update machine:
|
@update machine:
|
||||||
|
just assert '-d "../systems/x86_64-linux/{{ machine }}"' "Machine {{ machine }} does not exist, must be one of: $(ls ../systems/x86_64-linux/ | tr '\n' ' ')"
|
||||||
nixos-rebuild switch --use-remote-sudo --target-host {{ machine }} --flake ..#{{ machine }}
|
nixos-rebuild switch --use-remote-sudo --target-host {{ machine }} --flake ..#{{ machine }}
|
||||||
13
.justfile
13
.justfile
|
|
@ -19,4 +19,15 @@ mod machine '.just/machine.just'
|
||||||
|
|
||||||
[doc('Introspection on flake output')]
|
[doc('Introspection on flake output')]
|
||||||
@select key:
|
@select key:
|
||||||
nix eval --json .#{{ key }} | jq .
|
nix eval --json .#{{ key }} | jq .
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#===============================================================================================
|
||||||
|
# Utils
|
||||||
|
#===============================================================================================
|
||||||
|
[no-exit-message]
|
||||||
|
[no-cd]
|
||||||
|
[private]
|
||||||
|
@assert condition message:
|
||||||
|
[ {{ condition }} ] || { echo -e 1>&2 "\n\x1b[1;41m Error \x1b[0m {{ message }}\n"; exit 1; }
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ config, lib, pkgs, namespace, system, inputs, ... }:
|
{ config, lib, pkgs, namespace, system, inputs, ... }:
|
||||||
let
|
let
|
||||||
inherit (lib) mkIf mkEnableOption mkOption types toUpper nameValuePair mapAttrs' concatMapAttrs getAttrs getAttr hasAttr typeOf head drop length;
|
inherit (lib) mkIf mkEnableOption mkOption types toUpper toSentenceCase nameValuePair mapAttrs' concatMapAttrs concatMap listToAttrs imap0 getAttrs getAttr hasAttr typeOf head drop length;
|
||||||
inherit (lib.${namespace}.strings) toSnakeCase;
|
inherit (lib.${namespace}.strings) toSnakeCase;
|
||||||
|
|
||||||
cfg = config.${namespace}.services.authentication.zitadel;
|
cfg = config.${namespace}.services.authentication.zitadel;
|
||||||
|
|
@ -73,6 +73,40 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
role = mkOption {
|
||||||
|
default = {};
|
||||||
|
type = types.attrsOf (types.submodule ({ name, ... }: {
|
||||||
|
options =
|
||||||
|
let
|
||||||
|
roleName = name;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
displayName = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = toSentenceCase name;
|
||||||
|
example = "RoleName";
|
||||||
|
description = ''
|
||||||
|
Name used for project role.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
group = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
example = "some_group";
|
||||||
|
description = ''
|
||||||
|
Group used for project role.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
|
assign = mkOption {
|
||||||
|
default = {};
|
||||||
|
type = types.attrsOf (types.listOf types.str);
|
||||||
|
};
|
||||||
|
|
||||||
application = mkOption {
|
application = mkOption {
|
||||||
default = {};
|
default = {};
|
||||||
type = types.attrsOf (types.submodule {
|
type = types.attrsOf (types.submodule {
|
||||||
|
|
@ -174,6 +208,74 @@ in
|
||||||
};
|
};
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
action = mkOption {
|
||||||
|
default = {};
|
||||||
|
type = types.attrsOf (types.submodule ({ name, ... }: {
|
||||||
|
options = {
|
||||||
|
script = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
example = ''
|
||||||
|
(ctx, api) => {
|
||||||
|
api.v1.claims.setClaim('some_claim', 'some_value');
|
||||||
|
};
|
||||||
|
'';
|
||||||
|
description = ''
|
||||||
|
The script to run. This must be a function that receives 2 parameters, and returns void. During the creation of the action's script this module simly does `const {{name}} = {{script}}`.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
timeout = mkOption {
|
||||||
|
type = (types.ints.between 0 20);
|
||||||
|
default = 10;
|
||||||
|
example = "10";
|
||||||
|
description = ''
|
||||||
|
After which time the action will be terminated if not finished.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
allowedToFail = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
example = "true";
|
||||||
|
description = ''
|
||||||
|
Allowed to fail.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
|
triggers = mkOption {
|
||||||
|
default = [];
|
||||||
|
type = types.listOf (types.submodule {
|
||||||
|
options = {
|
||||||
|
flowType = mkOption {
|
||||||
|
type = types.enum [ "authentication" "customiseToken" "internalAuthentication" "samlResponse" ];
|
||||||
|
example = "customiseToken";
|
||||||
|
description = ''
|
||||||
|
Type of the flow to which the action triggers belong.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
triggerType = mkOption {
|
||||||
|
type = types.enum [ "postAuthentication" "preCreation" "postCreation" "preUserinfoCreation" "preAccessTokenCreation" "preSamlResponse" ];
|
||||||
|
example = "postAuthentication";
|
||||||
|
description = ''
|
||||||
|
Trigger type on when the actions get triggered.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
actions = mkOption {
|
||||||
|
type = types.nonEmptyListOf types.str;
|
||||||
|
example = ''[ "action_name" ]'';
|
||||||
|
description = ''
|
||||||
|
Names of actions to trigger
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
@ -191,23 +293,28 @@ in
|
||||||
mapEnum = prefix: value: "${prefix}_${value |> toSnakeCase |> toUpper}";
|
mapEnum = prefix: value: "${prefix}_${value |> toSnakeCase |> toUpper}";
|
||||||
|
|
||||||
mapValue = type: value: ({
|
mapValue = type: value: ({
|
||||||
|
appType = mapEnum "OIDC_APP_TYPE" value;
|
||||||
grantTypes = map (t: mapEnum "OIDC_GRANT_TYPE" t) value;
|
grantTypes = map (t: mapEnum "OIDC_GRANT_TYPE" t) value;
|
||||||
responseTypes = map (t: mapEnum "OIDC_RESPONSE_TYPE" t) value;
|
responseTypes = map (t: mapEnum "OIDC_RESPONSE_TYPE" t) value;
|
||||||
|
authMethodType = mapEnum "OIDC_AUTH_METHOD_TYPE" value;
|
||||||
|
|
||||||
|
flowType = mapEnum "FLOW_TYPE" value;
|
||||||
|
triggerType = mapEnum "TRIGGER_TYPE" value;
|
||||||
|
accessTokenType = mapEnum "OIDC_TOKEN_TYPE" value;
|
||||||
}."${type}" or value);
|
}."${type}" or value);
|
||||||
|
|
||||||
toResource = name: value: nameValuePair
|
toResource = name: value: nameValuePair
|
||||||
(toSnakeCase name)
|
(toSnakeCase name)
|
||||||
(lib.mapAttrs' (k: v: nameValuePair (toSnakeCase k) (mapValue k v)) value);
|
(lib.mapAttrs' (k: v: nameValuePair (toSnakeCase k) (mapValue k v)) value);
|
||||||
|
|
||||||
withName = name: attrs: attrs // { inherit name; };
|
|
||||||
withRef = type: name: attrs: attrs // (mapRef type name);
|
withRef = type: name: attrs: attrs // (mapRef type name);
|
||||||
withDefaults = defaults: attrs: defaults // attrs;
|
|
||||||
|
|
||||||
select = keys: callback: set:
|
select = keys: callback: set:
|
||||||
if (length keys) == 0 then
|
if (length keys) == 0 then
|
||||||
mapAttrs' callback set
|
mapAttrs' callback set
|
||||||
else let key = head keys; in
|
else let key = head keys; in
|
||||||
concatMapAttrs (k: v: select (drop 1 keys) (callback k) (v.${key} or {})) set;
|
concatMapAttrs (k: v: select (drop 1 keys) (callback k) (v.${key} or {})) set
|
||||||
|
;
|
||||||
|
|
||||||
config' = config;
|
config' = config;
|
||||||
|
|
||||||
|
|
@ -231,57 +338,105 @@ in
|
||||||
|
|
||||||
resource = {
|
resource = {
|
||||||
# Organizations
|
# Organizations
|
||||||
zitadel_org = cfg.organization |> select [] (name: value:
|
zitadel_org = cfg.organization |> select [] (name: { isDefault, ... }:
|
||||||
value
|
{ inherit name isDefault; }
|
||||||
|> getAttrs [ "isDefault" ]
|
|
||||||
|> withName name
|
|
||||||
|> toResource name
|
|> toResource name
|
||||||
);
|
);
|
||||||
|
|
||||||
# Projects per organization
|
# Projects per organization
|
||||||
zitadel_project = cfg.organization |> select [ "project" ] (org: name: value:
|
zitadel_project = cfg.organization |> select [ "project" ] (org: name: { hasProjectCheck, privateLabelingSetting, projectRoleAssertion, projectRoleCheck, ... }:
|
||||||
value
|
{
|
||||||
|> getAttrs [ "hasProjectCheck" "privateLabelingSetting" "projectRoleAssertion" "projectRoleCheck" ]
|
inherit name hasProjectCheck privateLabelingSetting projectRoleAssertion projectRoleCheck;
|
||||||
|> withName name
|
}
|
||||||
|> withRef "org" org
|
|> withRef "org" org
|
||||||
|> toResource name
|
|> toResource "${org}_${name}"
|
||||||
);
|
);
|
||||||
|
|
||||||
# Each OIDC app per project
|
# Each OIDC app per project
|
||||||
zitadel_application_oidc = cfg.organization |> select [ "project" "application" ] (org: project: name: value:
|
zitadel_application_oidc = cfg.organization |> select [ "project" "application" ] (org: project: name: { redirectUris, grantTypes, responseTypes, ...}:
|
||||||
value
|
{
|
||||||
|> getAttrs [ "redirectUris" "grantTypes" "responseTypes" ]
|
inherit name redirectUris grantTypes responseTypes;
|
||||||
|> withName name
|
|
||||||
|
accessTokenRoleAssertion = true;
|
||||||
|
idTokenRoleAssertion = true;
|
||||||
|
accessTokenType = "JWT";
|
||||||
|
}
|
||||||
|> withRef "org" org
|
|> withRef "org" org
|
||||||
|> withRef "project" project
|
|> withRef "project" "${org}_${project}"
|
||||||
|> toResource name
|
|> toResource "${org}_${project}_${name}"
|
||||||
|
);
|
||||||
|
|
||||||
|
# Each project role
|
||||||
|
zitadel_project_role = cfg.organization |> select [ "project" "role" ] (org: project: name: value:
|
||||||
|
{ inherit (value) displayName group; roleKey = name; }
|
||||||
|
|> withRef "org" org
|
||||||
|
|> withRef "project" "${org}_${project}"
|
||||||
|
|> toResource "${org}_${project}_${name}"
|
||||||
|
);
|
||||||
|
|
||||||
|
# Each project role assignment
|
||||||
|
zitadel_user_grant = cfg.organization |> select [ "project" "assign" ] (org: project: user: roles:
|
||||||
|
{ roleKeys = roles; }
|
||||||
|
|> withRef "org" org
|
||||||
|
|> withRef "project" "${org}_${project}"
|
||||||
|
|> withRef "user" "${org}_${user}"
|
||||||
|
|> toResource "${org}_${project}_${user}"
|
||||||
);
|
);
|
||||||
|
|
||||||
# Users
|
# Users
|
||||||
zitadel_human_user = cfg.organization |> select [ "user" ] (org: name: value:
|
zitadel_human_user = cfg.organization |> select [ "user" ] (org: name: { email, userName, firstName, lastName, ... }:
|
||||||
value
|
{
|
||||||
|> getAttrs [ "email" "userName" "firstName" "lastName" ]
|
inherit email userName firstName lastName;
|
||||||
|
|
||||||
|
isEmailVerified = true;
|
||||||
|
}
|
||||||
|> withRef "org" org
|
|> withRef "org" org
|
||||||
|> withDefaults { isEmailVerified = true; }
|
|> toResource "${org}_${name}"
|
||||||
|> toResource name
|
|
||||||
);
|
);
|
||||||
|
|
||||||
# Global user roles
|
# Global user roles
|
||||||
zitadel_instance_member = cfg.organization |> select [ "user" ] (org: name: value:
|
zitadel_instance_member = cfg.organization |> select [ "user" ] (org: name: value:
|
||||||
{ roles = value.instanceRoles; }
|
{ roles = value.instanceRoles; }
|
||||||
|> withRef "user" name
|
|> withRef "user" "${org}_${name}"
|
||||||
|> toResource name
|
|> toResource "${org}_${name}"
|
||||||
);
|
);
|
||||||
|
|
||||||
# Organazation specific roles
|
# Organazation specific roles
|
||||||
zitadel_org_member = cfg.organization |> select [ "user" ] (org: name: value:
|
zitadel_org_member = cfg.organization |> select [ "user" ] (org: name: { roles, ... }:
|
||||||
value
|
{ inherit roles; }
|
||||||
|> getAttrs [ "roles" ]
|
|
||||||
|> withRef "org" org
|
|> withRef "org" org
|
||||||
|> withRef "user" name
|
|> withRef "user" "${org}_${name}"
|
||||||
|> toResource name
|
|> toResource "${org}_${name}"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
# Organazation's actions
|
||||||
|
zitadel_action = cfg.organization |> select [ "action" ] (org: name: { timeout, allowedToFail, script, ...}:
|
||||||
|
{
|
||||||
|
inherit allowedToFail name;
|
||||||
|
timeout = "${toString timeout}s";
|
||||||
|
script = "const ${name} = ${script}";
|
||||||
|
}
|
||||||
|
|> withRef "org" org
|
||||||
|
|> toResource "${org}_${name}"
|
||||||
|
);
|
||||||
|
|
||||||
|
# Organazation's action assignments
|
||||||
|
zitadel_trigger_actions = cfg.organization
|
||||||
|
|> concatMapAttrs (org: { triggers, ... }:
|
||||||
|
triggers
|
||||||
|
|> imap0 (i: { flowType, triggerType, actions, ... }: (let name = "trigger_${toString i}"; in
|
||||||
|
{
|
||||||
|
inherit flowType triggerType;
|
||||||
|
|
||||||
|
actionIds = actions
|
||||||
|
|> map (action: (lib.tfRef "zitadel_action.${org}_${toSnakeCase action}.id"));
|
||||||
|
}
|
||||||
|
|> withRef "org" org
|
||||||
|
|> toResource "${org}_${name}"
|
||||||
|
))
|
||||||
|
|> listToAttrs
|
||||||
|
);
|
||||||
|
|
||||||
# SMTP config
|
# SMTP config
|
||||||
zitadel_smtp_config.default = {
|
zitadel_smtp_config.default = {
|
||||||
sender_address = "chris@kruining.eu";
|
sender_address = "chris@kruining.eu";
|
||||||
|
|
@ -289,18 +444,18 @@ in
|
||||||
tls = true;
|
tls = true;
|
||||||
host = "black-mail.nl:587";
|
host = "black-mail.nl:587";
|
||||||
user = "chris@kruining.eu";
|
user = "chris@kruining.eu";
|
||||||
password = lib.tfRef "file(\"${config'.sops.secrets."email/chris_kruining_eu".path}\")";
|
password = lib.tfRef "file(\"${config'.sops.secrets."zitadel/email".path}\")";
|
||||||
set_active = true;
|
set_active = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Client credentials per app
|
# Client credentials per app
|
||||||
local_sensitive_file = cfg.organization |> select [ "project" "application" ] (org: project: name: value:
|
local_sensitive_file = cfg.organization |> select [ "project" "application" ] (org: project: name: value:
|
||||||
nameValuePair name {
|
nameValuePair "${org}_${project}_${name}" {
|
||||||
content = ''
|
content = ''
|
||||||
CLIENT_ID=${lib.tfRef "resource.zitadel_application_oidc.${name}.client_id"}
|
CLIENT_ID=${lib.tfRef "resource.zitadel_application_oidc.${org}_${project}_${name}.client_id"}
|
||||||
CLIENT_SECRET=${lib.tfRef "resource.zitadel_application_oidc.${name}.client_secret"}
|
CLIENT_SECRET=${lib.tfRef "resource.zitadel_application_oidc.${org}_${project}_${name}.client_secret"}
|
||||||
'';
|
'';
|
||||||
filename = "/var/lib/zitadel/clients/${name}";
|
filename = "/var/lib/zitadel/clients/${org}_${project}_${name}";
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
@ -335,6 +490,9 @@ in
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Print the path to the source for easier debugging
|
||||||
|
echo "config location: ${terraformConfiguration}"
|
||||||
|
|
||||||
# Copy infra code into workspace
|
# Copy infra code into workspace
|
||||||
cp -f ${terraformConfiguration} config.tf.json
|
cp -f ${terraformConfiguration} config.tf.json
|
||||||
|
|
||||||
|
|
@ -342,6 +500,7 @@ in
|
||||||
${lib.getExe pkgs.opentofu} init
|
${lib.getExe pkgs.opentofu} init
|
||||||
|
|
||||||
# Run the infrastructure code
|
# Run the infrastructure code
|
||||||
|
# ${lib.getExe pkgs.opentofu} plan
|
||||||
${lib.getExe pkgs.opentofu} apply -auto-approve
|
${lib.getExe pkgs.opentofu} apply -auto-approve
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
@ -475,9 +634,10 @@ in
|
||||||
restartUnits = [ "zitadel.service" ]; #EMGDB#6O$8qpGoLI1XjhUhnng1san@0
|
restartUnits = [ "zitadel.service" ]; #EMGDB#6O$8qpGoLI1XjhUhnng1san@0
|
||||||
};
|
};
|
||||||
|
|
||||||
"email/chris_kruining_eu" = {
|
"zitadel/email" = {
|
||||||
owner = "zitadel";
|
owner = "zitadel";
|
||||||
group = "zitadel";
|
group = "zitadel";
|
||||||
|
key = "email/chris_kruining_eu";
|
||||||
restartUnits = [ "zitadel.service" ];
|
restartUnits = [ "zitadel.service" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -29,43 +29,33 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
extras = [ "oidc" ];
|
extras = [ "oidc" ];
|
||||||
# plugins = with config.services.matrix-synapse.package.plugins; [];
|
|
||||||
|
extraConfigFiles = [
|
||||||
|
config.sops.templates."synapse-oidc.yaml".path
|
||||||
|
];
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
server_name = domain;
|
server_name = domain;
|
||||||
public_baseurl = "https://${fqn}";
|
public_baseurl = "https://${fqn}";
|
||||||
|
|
||||||
|
enable_metrics = true;
|
||||||
|
|
||||||
registration_shared_secret = "tZtBnlhEmLbMwF0lQ112VH1Rl5MkZzYH9suI4pEoPXzk6nWUB8FJF4eEnwLkbstz";
|
registration_shared_secret = "tZtBnlhEmLbMwF0lQ112VH1Rl5MkZzYH9suI4pEoPXzk6nWUB8FJF4eEnwLkbstz";
|
||||||
|
|
||||||
url_preview_enabled = true;
|
url_preview_enabled = true;
|
||||||
precence.enabled = true;
|
precence.enabled = true;
|
||||||
|
|
||||||
# Since we'll be using OIDC for auth disable all local options
|
# Since we'll be using OIDC for auth disable all local options
|
||||||
enable_registration = false;
|
enable_registration = true;
|
||||||
|
enable_registration_without_verification = true;
|
||||||
password_config.enabled = false;
|
password_config.enabled = false;
|
||||||
|
backchannel_logout_enabled = true;
|
||||||
|
|
||||||
sso = {
|
sso = {
|
||||||
client_whitelist = [ "http://[::1]:9092" ];
|
client_whitelist = [ "http://[::1]:9092" ];
|
||||||
update_profile_information = true;
|
update_profile_information = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
oidc_providers = [
|
|
||||||
{
|
|
||||||
discover = true;
|
|
||||||
|
|
||||||
idp_id = "zitadel";
|
|
||||||
idp_name = "Zitadel";
|
|
||||||
issuer = "https://auth.kruining.eu";
|
|
||||||
client_id = "337858153251143939";
|
|
||||||
client_secret = "ePkf5n8BxGD5DF7t1eNThTL0g6PVBO5A1RC0EqPp61S7VsiyXvDs8aJeczrpCpsH";
|
|
||||||
scopes = [ "openid" "profile" ];
|
|
||||||
# user_mapping_provider.config = {
|
|
||||||
# localpart_template = "{{ user.prefered_username }}";
|
|
||||||
# display_name_template = "{{ user.name }}";
|
|
||||||
# };
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
database = {
|
database = {
|
||||||
# this is postgresql (also the default, but I prefer to be explicit)
|
# this is postgresql (also the default, but I prefer to be explicit)
|
||||||
name = "psycopg2";
|
name = "psycopg2";
|
||||||
|
|
@ -85,7 +75,7 @@ in
|
||||||
|
|
||||||
resources = [
|
resources = [
|
||||||
{
|
{
|
||||||
names = [ "client" "federation" ];
|
names = [ "client" "federation" "openid" "metrics" "media" "health" ];
|
||||||
compress = true;
|
compress = true;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
@ -175,5 +165,30 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sops = {
|
||||||
|
secrets = {
|
||||||
|
"synapse/oidc_id" = {};
|
||||||
|
"synapse/oidc_secret" = {};
|
||||||
|
};
|
||||||
|
|
||||||
|
templates = {
|
||||||
|
"synapse-oidc.yaml" = {
|
||||||
|
owner = "matrix-synapse";
|
||||||
|
content = ''
|
||||||
|
oidc_providers:
|
||||||
|
- discover: true
|
||||||
|
idp_id: zitadel
|
||||||
|
idp_name: Zitadel
|
||||||
|
issuer: "https://auth.kruining.eu"
|
||||||
|
scopes:
|
||||||
|
- openid
|
||||||
|
- profile
|
||||||
|
client_id: '${config.sops.placeholder."synapse/oidc_id"}'
|
||||||
|
client_secret: '${config.sops.placeholder."synapse/oidc_secret"}'
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{ config, lib, pkgs, namespace, ... }:
|
{ config, lib, pkgs, namespace, ... }:
|
||||||
let
|
let
|
||||||
inherit (lib) mkIf mkEnableOption;
|
inherit (builtins) toString;
|
||||||
|
inherit (lib) mkIf mkEnableOption mkOption;
|
||||||
|
|
||||||
cfg = config.${namespace}.services.development.forgejo;
|
cfg = config.${namespace}.services.development.forgejo;
|
||||||
domain = "git.amarth.cloud";
|
domain = "git.amarth.cloud";
|
||||||
|
|
@ -8,6 +9,15 @@ in
|
||||||
{
|
{
|
||||||
options.${namespace}.services.development.forgejo = {
|
options.${namespace}.services.development.forgejo = {
|
||||||
enable = mkEnableOption "Forgejo";
|
enable = mkEnableOption "Forgejo";
|
||||||
|
|
||||||
|
port = mkOption {
|
||||||
|
type = lib.types.port;
|
||||||
|
default = 5002;
|
||||||
|
example = "1234";
|
||||||
|
description = ''
|
||||||
|
Which port to bind forgejo to
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
|
@ -33,7 +43,7 @@ in
|
||||||
server = {
|
server = {
|
||||||
DOMAIN = domain;
|
DOMAIN = domain;
|
||||||
ROOT_URL = "https://${domain}/";
|
ROOT_URL = "https://${domain}/";
|
||||||
HTTP_PORT = 5002;
|
HTTP_PORT = cfg.port;
|
||||||
LANDING_PAGE = "explore";
|
LANDING_PAGE = "explore";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -83,7 +93,7 @@ in
|
||||||
openid = {
|
openid = {
|
||||||
ENABLE_OPENID_SIGNIN = true;
|
ENABLE_OPENID_SIGNIN = true;
|
||||||
ENABLE_OPENID_SIGNUP = true;
|
ENABLE_OPENID_SIGNUP = true;
|
||||||
WHITELISTED_URIS = "https://auth.amarth.cloud";
|
WHITELISTED_URIS = "https://auth.kruining.eu";
|
||||||
};
|
};
|
||||||
|
|
||||||
oauth2_client = {
|
oauth2_client = {
|
||||||
|
|
@ -102,6 +112,10 @@ in
|
||||||
SHOW_FOOTER_TEMPLATE_LOAD_TIME = false;
|
SHOW_FOOTER_TEMPLATE_LOAD_TIME = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
metrics = {
|
||||||
|
ENABLED = true;
|
||||||
|
};
|
||||||
|
|
||||||
api = {
|
api = {
|
||||||
ENABLE_SWAGGER = false;
|
ENABLE_SWAGGER = false;
|
||||||
};
|
};
|
||||||
|
|
@ -120,9 +134,9 @@ in
|
||||||
PROTOCOL = "smtp+starttls";
|
PROTOCOL = "smtp+starttls";
|
||||||
SMTP_ADDR = "black-mail.nl";
|
SMTP_ADDR = "black-mail.nl";
|
||||||
SMTP_PORT = 587;
|
SMTP_PORT = 587;
|
||||||
FROM = "info@amarth.cloud";
|
FROM = "chris@kruining.eu";
|
||||||
USER = "info@amarth.cloud";
|
USER = "chris@kruining.eu";
|
||||||
PASSWD = "__TODO_USE_SOPS__";
|
PASSWD_URI = "file:${config.sops.secrets."forgejo/email".path}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -137,8 +151,8 @@ in
|
||||||
url = "https://git.amarth.cloud";
|
url = "https://git.amarth.cloud";
|
||||||
# Obtaining the path to the runner token file may differ
|
# Obtaining the path to the runner token file may differ
|
||||||
# tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd
|
# tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd
|
||||||
# tokenFile = config.age.secrets.forgejo-runner-token.path;
|
tokenFile = config.sops.secrets."forgejo/action_runner_token".path;
|
||||||
token = "ZBetud1F0IQ9VjVFpZ9bu0FXgx9zcsy1x25yvjhw";
|
# token = "ZBetud1F0IQ9VjVFpZ9bu0FXgx9zcsy1x25yvjhw";
|
||||||
labels = [
|
labels = [
|
||||||
"default:docker://nixos/nix:latest"
|
"default:docker://nixos/nix:latest"
|
||||||
"ubuntu:docker://ubuntu:24-bookworm"
|
"ubuntu:docker://ubuntu:24-bookworm"
|
||||||
|
|
@ -153,17 +167,32 @@ in
|
||||||
caddy = {
|
caddy = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts = {
|
virtualHosts = {
|
||||||
${domain}.extraConfig = ''
|
"${domain}".extraConfig = ''
|
||||||
# import auth-z
|
# import auth
|
||||||
|
|
||||||
# stupid dumb way to prevent the login page and go to zitadel instead
|
# stupid dumb way to prevent the login page and go to zitadel instead
|
||||||
# be aware that this does not disable local login at all!
|
# be aware that this does not disable local login at all!
|
||||||
# rewrite /user/login /user/oauth2/Zitadel
|
# rewrite /user/login /user/oauth2/Zitadel
|
||||||
|
|
||||||
reverse_proxy http://127.0.0.1:5002
|
reverse_proxy http://127.0.0.1:${toString cfg.port}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sops.secrets = {
|
||||||
|
"forgejo/action_runner_token" = {
|
||||||
|
owner = "gitea-runner";
|
||||||
|
group = "gitea-runner";
|
||||||
|
restartUnits = [ "gitea-runner-default.service" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
"forgejo/email" = {
|
||||||
|
owner = "forgejo";
|
||||||
|
group = "forgejo";
|
||||||
|
key = "email/chris_kruining_eu";
|
||||||
|
restartUnits = [ "forgejo.service" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -57,6 +57,23 @@
|
||||||
|
|
||||||
project = {
|
project = {
|
||||||
ulmo = {
|
ulmo = {
|
||||||
|
projectRoleCheck = true;
|
||||||
|
projectRoleAssertion = true;
|
||||||
|
hasProjectCheck = true;
|
||||||
|
|
||||||
|
role = {
|
||||||
|
jellyfin = {
|
||||||
|
group = "jellyfin";
|
||||||
|
};
|
||||||
|
jellyfin_admin = {
|
||||||
|
group = "jellyfin";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
assign = {
|
||||||
|
chris = [ "jellyfin" "jellyfin_admin" ];
|
||||||
|
};
|
||||||
|
|
||||||
application = {
|
application = {
|
||||||
jellyfin = {
|
jellyfin = {
|
||||||
redirectUris = [ "https://jellyfin.kruining.eu/sso/OID/redirect/zitadel" ];
|
redirectUris = [ "https://jellyfin.kruining.eu/sso/OID/redirect/zitadel" ];
|
||||||
|
|
@ -78,6 +95,27 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
action = {
|
||||||
|
flattenRoles = {
|
||||||
|
script = ''
|
||||||
|
(ctx, api) => {
|
||||||
|
if (ctx.v1.user.grants == undefined || ctx.v1.user.grants.count == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const roles = ctx.v1.user.grants.grants.flatMap(({ roles, projectId }) => roles.map(role => projectId + ':' + role));
|
||||||
|
|
||||||
|
api.v1.claims.setClaim('nix:zitadel:custom', JSON.stringify({ roles }));
|
||||||
|
};
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
triggers = [
|
||||||
|
{ flowType = "customiseToken"; triggerType = "preUserinfoCreation"; actions = [ "flattenRoles" ]; }
|
||||||
|
{ flowType = "customiseToken"; triggerType = "preAccessTokenCreation"; actions = [ "flattenRoles" ]; }
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,11 @@ email:
|
||||||
info_amarth_cloud: ENC[AES256_GCM,data:/x7aAFAxXYYf79tB08VQmmuTIy2TvdSTFfAzIWdIr+I=,iv:plNxS6oOin+oEql+1xsePOsUfLJkf+ZPBviPRTbIghE=,tag:hjtK3rysd2NNBA2mWdv8cw==,type:str]
|
info_amarth_cloud: ENC[AES256_GCM,data:/x7aAFAxXYYf79tB08VQmmuTIy2TvdSTFfAzIWdIr+I=,iv:plNxS6oOin+oEql+1xsePOsUfLJkf+ZPBviPRTbIghE=,tag:hjtK3rysd2NNBA2mWdv8cw==,type:str]
|
||||||
zitadel:
|
zitadel:
|
||||||
masterKey: ENC[AES256_GCM,data:4MPvBo407qrS7NF4oUTf84tZoPkSRmiHdD7qpkYeHME=,iv:H2NIAN0xBUDqnyco9gA3zYAsKtSeA/JpqYrPhc1eqc0=,tag:6OFGDfsucG5gDerImgpuXA==,type:str]
|
masterKey: ENC[AES256_GCM,data:4MPvBo407qrS7NF4oUTf84tZoPkSRmiHdD7qpkYeHME=,iv:H2NIAN0xBUDqnyco9gA3zYAsKtSeA/JpqYrPhc1eqc0=,tag:6OFGDfsucG5gDerImgpuXA==,type:str]
|
||||||
|
forgejo:
|
||||||
|
action_runner_token: ENC[AES256_GCM,data:yJ6OnRq5kinbuhvH06K5o3l86EafuBoojMwg/qhP+cgeH+BwPeE+Ng==,iv:IeXJahPxgLNIUFmkgp495tLVh8UyQBmJ2SnVEUhlhHs=,tag:XYQi613CxSp8AQeilJMrsg==,type:str]
|
||||||
|
synapse:
|
||||||
|
oidc_id: ENC[AES256_GCM,data:GPc4XBmIqWKbisN8patC0MNR,iv:wKCZ7PWn1WZOboc9I3JQXaxn4NiqMckCgC4d001F7jk=,tag:CBKcW4luhrJ+BOGH+UBmog==,type:str]
|
||||||
|
oidc_secret: ENC[AES256_GCM,data:3Z8XwAPBHUG7Z09uTkd0ZH80lRVPF2a8tt0cFvrFA9s5R6G2ULkbHZM5V2VZBZ7FNhv7JINilGdRaibvF3U3Tg==,iv:U5Z3VcuWxwX5kNTvmG7YFiPJSl8Xg2nRDPdz0tekric=,tag:o2s67WjB7mXJlyo8jlcUzw==,type:str]
|
||||||
sops:
|
sops:
|
||||||
age:
|
age:
|
||||||
- recipient: age19qfpf980tadguqq44zf6xwvjvl428dyrj46ha3n6aeqddwhtnuqqml7etq
|
- recipient: age19qfpf980tadguqq44zf6xwvjvl428dyrj46ha3n6aeqddwhtnuqqml7etq
|
||||||
|
|
@ -23,7 +28,7 @@ sops:
|
||||||
TTRWaHhpNWlkVDFmMFN4ZTNHMUxyNVkKV693pzTKRkZboQCMPr9IyMGSgxfuHXcb
|
TTRWaHhpNWlkVDFmMFN4ZTNHMUxyNVkKV693pzTKRkZboQCMPr9IyMGSgxfuHXcb
|
||||||
Y6BNcp6Qg6PWtX5QI7wRkPNINAK1TEbRBba+b8h6gMmVU4DliQyFiQ==
|
Y6BNcp6Qg6PWtX5QI7wRkPNINAK1TEbRBba+b8h6gMmVU4DliQyFiQ==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2025-10-27T13:11:41Z"
|
lastmodified: "2025-10-30T20:58:01Z"
|
||||||
mac: ENC[AES256_GCM,data:0LS7xQlkfIZRVwAZPE33KmPA19CpnXj/t4hpDrVW+BbESpnBku2oxPB/Cvp0dY5MGnDFgU4Htp0JoppHCgKvkaSBhvjxjW2DT1Nkk5PBmAtuzZLW4qc25ZVlqiKgzj1LE3XPTbqUJyp+X3U23BnU1ViTGgHuBcdEV7TFNHjmnwk=,iv:HpVIDAU1FbrUKXW8klWq0Kn9ZtKcgwR1jKXLkGtDd5A=,tag:50P0UZtj77npD92zxCaZHw==,type:str]
|
mac: ENC[AES256_GCM,data:7vQ5wV58UNUH5bOgyUxaifAbU3GTqZi2gH+rpAR+d/31rx8yeKVNMj0aWA5ianpUvVt2kbaap6Aj+Sxl3M8wI9jtg2o/3FmR+xEHEWgQ/jw1q9zvKIAUV6SeM1Hg639iV3xcC8F8U+Xy50H85f4B3XQWGJMnUamqH9LYrUjv8nY=,iv:vOGvilRSrPZW3uir1nwlxzhg+hXE5yw6r8vCr5Cxmt0=,tag:X9OYdCPuDz3o5kYLUKHmXg==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.11.0
|
version: 3.11.0
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue