Compare commits
2 commits
13ab4ae245
...
866f8b1b90
Author | SHA1 | Date | |
---|---|---|---|
|
866f8b1b90 | ||
|
5a48cedb58 |
2 changed files with 14 additions and 7 deletions
|
@ -2,10 +2,10 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
svc_domain = "git.${config.mine.shared.settings.domain}";
|
svc_domain = "git.${config.mine.shared.settings.domain}";
|
||||||
|
|
||||||
in {
|
in {
|
||||||
services.forgejo = {
|
services.forgejo = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
stateDir = config.mine.zfsMounts."rpool/safe/svcs/forgejo";
|
||||||
|
|
||||||
package = pkgs.forgejo.overrideAttrs (old: {
|
package = pkgs.forgejo.overrideAttrs (old: {
|
||||||
patches = old.patches ++ [
|
patches = old.patches ++ [
|
||||||
|
@ -14,7 +14,9 @@ in {
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
stateDir = config.mine.zfsMounts."rpool/safe/svcs/forgejo";
|
# use postgres, will create and start postgresql
|
||||||
|
# itself, as well as databdase and user
|
||||||
|
database.type = "postgres";
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
server = {
|
server = {
|
||||||
|
|
|
@ -152,6 +152,11 @@ in {
|
||||||
# secrets
|
# secrets
|
||||||
secretFile = config.age.secrets.nextcloud-secrets.path;
|
secretFile = config.age.secrets.nextcloud-secrets.path;
|
||||||
|
|
||||||
|
# use postgresql for database
|
||||||
|
# createLocally will enable postgresql, add database and user
|
||||||
|
database.createLocally = true;
|
||||||
|
config.dbtype = "pgsql";
|
||||||
|
|
||||||
# settings
|
# settings
|
||||||
settings = {
|
settings = {
|
||||||
# open connect/oidc
|
# open connect/oidc
|
||||||
|
@ -193,11 +198,6 @@ in {
|
||||||
serviceConfig.RemainAfterExit = true;
|
serviceConfig.RemainAfterExit = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# ensure that nextcloud can access stateDir
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"Z ${stateDir} 6770 ${nextcloud_user} ${nextcloud_group} -"
|
|
||||||
];
|
|
||||||
|
|
||||||
# setup authelia for nextcloud
|
# setup authelia for nextcloud
|
||||||
services.authelia.instances.main.settings.identity_providers.oidc.clients = [{
|
services.authelia.instances.main.settings.identity_providers.oidc.clients = [{
|
||||||
client_id = AUTHELIA_AUTH_NAME;
|
client_id = AUTHELIA_AUTH_NAME;
|
||||||
|
@ -217,6 +217,11 @@ in {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# ensure that nextcloud can access stateDir
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"Z ${stateDir} 6770 ${nextcloud_user} ${nextcloud_group} -"
|
||||||
|
];
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
nextcloud-admin-pass.owner = nextcloud_user;
|
nextcloud-admin-pass.owner = nextcloud_user;
|
||||||
nextcloud-secrets.owner = nextcloud_user;
|
nextcloud-secrets.owner = nextcloud_user;
|
||||||
|
|
Loading…
Reference in a new issue