wurzel/fruitbasket
10
1
Fork 1
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity

fixing funny sogo sops problem

Browse source
This commit is contained in:
revol-xut 2023-05-12 15:17:22 +02:00
parent 1e93c28e5a
commit 86a615bbf0
No known key found for this signature in database
GPG key ID: 4F56FF7759627D07
6 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/portunus_seeds.json
View file

@ -42,13 +42,13 @@
"login_name": "admin", "login_name": "admin",
"given_name": "admin", "given_name": "admin",
"family_name": "admin", "family_name": "admin",
"password": { "from_command": ["/usr/bin/env", "cat", "/run/secrets/portunus_admin"] } "password": { "from_command": ["/usr/bin/env", "cat", "/run/secrets/portunus/users/search-password"] }
}, },
{ {
"login_name": "search", "login_name": "search",
"given_name": "search", "given_name": "search",
"family_name": "search", "family_name": "search",
"password": { "from_command": ["/usr/bin/env", "cat", "/run/secrets/portunus_search"] } "password": { "from_command": ["/usr/bin/env", "cat", "/run/secrets/portunus/users/search-password"] }
} }
] ]
} }

2
modules/hedgedoc.nix
View file

@ -79,7 +79,7 @@ in
postgres_hedgedoc.owner = user; postgres_hedgedoc.owner = user;
hedgedoc_session_secret.owner = user; hedgedoc_session_secret.owner = user;
hedgedoc_ldap_search = { hedgedoc_ldap_search = {
key = "portunus_search"; key = "portunus/users/search-password";
owner = user; owner = user;
}; };
}; };

11
modules/ldap.nix
View file

@ -63,7 +63,16 @@ in
"${portunusGroup}" = { "${portunusGroup}" = {
name = "${portunusGroup}"; name = "${portunusGroup}";
members = [ "${portunusUser}" ]; members = [
"${portunusUser}"
config.systemd.services."matrix-synapse".serviceConfig.User
config.systemd.services.sogo.serviceConfig.User
config.systemd.services.hedgedoc.serviceConfig.User
config.systemd.services.mailman.serviceConfig.User
config.systemd.services."mailman-web-setup".serviceConfig.User
config.systemd.services.hyperkitty.serviceConfig.User
config.systemd.services.nslcd.serviceConfig.User
];
}; };
"${ldapGroup}" = { "${ldapGroup}" = {
name = "${ldapGroup}"; name = "${ldapGroup}";

2
modules/mailman.nix
View file

@ -1,7 +1,7 @@
{ config, ... }: { config, ... }:
{ {
sops.secrets.mailman_ldap_search = { sops.secrets.mailman_ldap_search = {
key = "portunus_search"; key = "portunus/users/search-password";
owner = config.services.mailman.webUser; owner = config.services.mailman.webUser;
}; };
services.mailman = { services.mailman = {

2
modules/matrix.nix
View file

@ -25,7 +25,7 @@ let
in in
{ {
sops.secrets.matrix_ldap_search = { sops.secrets.matrix_ldap_search = {
key = "portunus_search"; key = "portunus/users/search-password";
owner = config.systemd.services.matrix-synapse.serviceConfig.User; owner = config.systemd.services.matrix-synapse.serviceConfig.User;
}; };

15
modules/sogo.nix
View file

@ -5,11 +5,14 @@ let
pg-port = toString config.services.postgresql.port; pg-port = toString config.services.postgresql.port;
in in
{ {
sops.secrets.ldap_search = { sops.secrets = {
owner = config.systemd.services.sogo.serviceConfig.User; postgres_sogo = {
}; owner = config.systemd.services.sogo.serviceConfig.User;
sops.secrets.postgres_sogo = { };
owner = config.systemd.services.sogo.serviceConfig.User; sogo_ldap_search = {
key = "portunus/users/search-password";
owner = config.systemd.services.sogo.serviceConfig.User;
};
}; };
services = { services = {
@ -35,7 +38,7 @@ in
OCSSessionsFolderURL = "postgresql://sogo:POSTGRES_PASSWORD@localhost:${pg-port}/sogo/sogo_sessions_folder"; OCSSessionsFolderURL = "postgresql://sogo:POSTGRES_PASSWORD@localhost:${pg-port}/sogo/sogo_sessions_folder";
''; # Hier ist bindPassword noch nicht vollständig ''; # Hier ist bindPassword noch nicht vollständig
configReplaces = { configReplaces = {
"LDAP_SEARCH" = config.sops.secrets.ldap_search.path; "LDAP_SEARCH" = config.sops.secrets.sogo_ldap_search.path;
"POSTGRES_PASSWORD" = config.sops.secrets.postgres_sogo.path; "POSTGRES_PASSWORD" = config.sops.secrets.postgres_sogo.path;
}; };
vhostName = "${sogo-hostname}"; vhostName = "${sogo-hostname}";