22
0
mirror of https://github.com/SuperSandro2000/nixos-modules.git synced 2024-06-10 18:24:05 +02:00

portunus: rebase group management patch

This commit is contained in:
Sandro - 2023-07-08 15:46:20 +02:00
parent 0000078a53
commit 0000000c06
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
6 changed files with 11 additions and 9 deletions

View File

@ -136,13 +136,13 @@ in
(lib.mkIf (cfgl.adminGroup != null) {
long_name = "Gitea Administrators";
name = cfgl.adminGroup;
dont_manage_members = true;
manage_members = false;
permissions = { };
})
(lib.mkIf (cfgl.userGroup != null) {
long_name = "Gitea Users";
name = cfgl.userGroup;
dont_manage_members = true;
manage_members = false;
permissions = { };
})
];

View File

@ -29,7 +29,7 @@ in
config.services.portunus.seedSettings.groups = lib.optional (cfg.userGroup != null) {
long_name = "Hedgedoc Users";
name = cfg.userGroup;
dont_manage_members = true;
manage_members = false;
permissions = {};
};
}

View File

@ -81,13 +81,13 @@ in
(lib.mkIf (cfg.userGroup != null) {
long_name = "Hydra Users";
name = cfg.userGroup;
dont_manage_members = true;
manage_members = false;
permissions = { };
})
] ++ lib.flatten (map lib.attrValues (map (lib.mapAttrs (ldapGroup: _: {
long_name = "Hydra Role ${ldapGroup}";
name = ldapGroup;
dont_manage_members = true;
manage_members = false;
permissions = { };
})) cfg.roleMappings));
}

View File

@ -60,7 +60,7 @@ in
config.services.portunus.seedSettings.groups = lib.optional (cfgl.userGroup != null) {
long_name = "Mastodon Users";
name = cfgl.userGroup;
dont_manage_members = true;
manage_members = false;
permissions = { };
};
}

View File

@ -169,7 +169,7 @@ in
config.services.portunus.seedSettings.groups = lib.optional (cfg.ldap.userGroup != null) {
long_name = "Matrix Users";
name = cfg.ldap.userGroup;
dont_manage_members = true;
manage_members = false;
permissions = { };
};
}

View File

@ -75,14 +75,16 @@ in
++ lib.optional cfg.removeAddGroup ./portunus-remove-add-group.diff
++ [
# display errors when editing seeded groups/users
# https://github.com/majewsky/portunus/pull/17
(fetchpatch {
url = "https://github.com/majewsky/portunus/commit/9999994e6b90e20405944767fb7d225914c2303b.patch";
sha256 = "sha256-IEQpWnG3ZekZ+QCEzSZcbMQe6iEalOhDz3qNbjDgg/A=";
})
# add option to not seed group members
# https://github.com/majewsky/portunus/pull/18
(fetchpatch {
url = "https://github.com/majewsky/portunus/commit/000003d2ab2d60f599c40cabc7992026c4b84589.patch";
sha256 = "sha256-UD5hciRMl2npDpfyjmbA+EDdtB4ADV+an71eJHZHIIE=";
url = "https://github.com/majewsky/portunus/commit/faff1294378dfb123985d3250e305bbbf278437b.patch";
sha256 = "sha256-BCB5zaXCbCnBMmlce64gqaXPh2ZnaeeQfNehqwXfiDI=";
})
];
});