forgejo: update configuration options
This commit is contained in:
parent
56965f56ce
commit
06917aab82
|
@ -9,18 +9,12 @@
|
|||
sources = import ../nix/sources.nix;
|
||||
unstable = import sources.nixpkgsUnstable {};
|
||||
in {
|
||||
services.gitea = {
|
||||
services.forgejo = {
|
||||
enable = true; # Enable Forgejo
|
||||
appName = "mcwhirter.io: Forgejo Service"; # Give the site a name
|
||||
database = {
|
||||
type = "postgres"; # Database type
|
||||
passwordFile = "/run/keys/gitea-dbpass"; # Where to find the password
|
||||
passwordFile = "/run/keys/forgejo-dbpass"; # Where to find the password
|
||||
};
|
||||
disableRegistration = true;
|
||||
domain = "source.mcwhirter.io"; # Domain name
|
||||
rootUrl = "https://source.mcwhirter.io/"; # Root web URL
|
||||
httpPort = 3002; # Provided unique port
|
||||
package = pkgs.forgejo; # a soft fork of gitea
|
||||
settings = let
|
||||
docutils = pkgs.python39.withPackages (ps:
|
||||
with ps; [
|
||||
|
@ -28,12 +22,21 @@ in {
|
|||
pygments # Provides syntax highlighting
|
||||
]);
|
||||
in {
|
||||
DEFAULT.APP_NAME = "mcwhirter.io: Forgejo Service"; # Give the site a name
|
||||
mailer = {
|
||||
ENABLED = true;
|
||||
FROM = "gitea@mcwhirter.io";
|
||||
FROM = "forgejo@mcwhirter.io";
|
||||
};
|
||||
repository = {DEFAULT_BRANCH = "consensus";};
|
||||
service = {REGISTER_EMAIL_CONFIRM = true;};
|
||||
server = {
|
||||
DOMAIN = "source.mcwhirter.io"; # Domain name
|
||||
HTTP_PORT = 3002; # Provided unique port
|
||||
ROOT_URL = "https://source.mcwhirter.io/"; # Root web URL
|
||||
};
|
||||
service = {
|
||||
DISABLE_REGISTRATION = true;
|
||||
};
|
||||
"markup.restructuredtext" = {
|
||||
ENABLED = true;
|
||||
FILE_EXTENSIONS = ".rst";
|
||||
|
@ -49,10 +52,10 @@ in {
|
|||
|
||||
systemd = {
|
||||
services = {
|
||||
gitea = {
|
||||
# Ensure gitea starts after nixops keys are loaded
|
||||
after = ["gitea-dbpass-key.service"];
|
||||
wants = ["gitea-dbpass-key.service"];
|
||||
forgejo = {
|
||||
# Ensure forgejo starts after nixops keys are loaded
|
||||
after = ["forgejo-dbpass-key.service"];
|
||||
wants = ["forgejo-dbpass-key.service"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -60,27 +63,23 @@ in {
|
|||
services.postgresql = {
|
||||
enable = true; # Ensure postgresql is enabled
|
||||
authentication = ''
|
||||
local gitea all ident map=gitea-users
|
||||
local forgejo all ident map=forgejo-users
|
||||
'';
|
||||
identMap =
|
||||
# Map the gitea user to postgresql
|
||||
# Map the forgejo user to postgresql
|
||||
''
|
||||
gitea-users gitea gitea
|
||||
forgejo-users forgejo forgejo
|
||||
'';
|
||||
ensureDatabases = ["gitea"]; # Ensure the database persists
|
||||
ensureDatabases = ["forgejo"]; # Ensure the database persists
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "gitea"; # Ensure the database user persists
|
||||
ensurePermissions = {
|
||||
# Ensure the database permissions persist
|
||||
"DATABASE gitea" = "ALL PRIVILEGES";
|
||||
"ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
|
||||
};
|
||||
name = "forgejo"; # Ensure the database user persists
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.postgresqlBackup.databases = ["gitea"];
|
||||
services.postgresqlBackup.databases = ["forgejo"];
|
||||
|
||||
services.nginx = {
|
||||
enable = true; # Enable Nginx
|
||||
|
@ -117,5 +116,5 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
users.groups.keys.members = ["gitea"]; # Required due to NixOps issue #1204
|
||||
users.groups.keys.members = ["forgejo"]; # Required due to NixOps issue #1204
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue