mikael/nixfiles-emily
1
0
Fork 0
forked from emily/nixfiles
Code Pull requests Activity

Fix urls for forgejo and vaultwarden

Browse source
This commit is contained in:
emily 2024-06-13 13:02:01 +02:00
parent b6331e6569
commit db7e4b50af
Signed by untrusted user: emily
GPG key ID: F6F4C66207FCF995
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config/services/forgejo.nix
View file

@ -21,6 +21,7 @@
SCHEDULE = "@every 24h"; SCHEDULE = "@every 24h";
UPDATE_EXISTING = true; UPDATE_EXISTING = true;
}; };
DEFAULT.APP_NAME = "The Gay Git";
federation.ENABLED = true; federation.ENABLED = true;
log.LEVEL = "Info"; log.LEVEL = "Info";
mailer = { mailer = {
@ -31,6 +32,11 @@
USER = "git@kyouma.net"; USER = "git@kyouma.net";
}; };
mirror.DEFAULT_INTERVAL = "1h"; mirror.DEFAULT_INTERVAL = "1h";
oauth2_client.REGISTER_EMAIL_CONFIRM = false;
openid = {
ENABLE_OPENID_SIGNIN = true;
ENABLE_OPENID_SIGNUP = true;
};
session = { session = {
COOKIE_SECURE = true; COOKIE_SECURE = true;
PROVIDER = "db"; PROVIDER = "db";
@ -40,6 +46,7 @@
STATIC_URL_PREFIX = "/static"; STATIC_URL_PREFIX = "/static";
PROTOCOL = "http+unix"; PROTOCOL = "http+unix";
DOMAIN = "git.kyouma.net"; DOMAIN = "git.kyouma.net";
ROOT_URL = "https://git.kyouma.net";
}; };
security = { security = {
LOGIN_REMEMBER_DAYS = 90; LOGIN_REMEMBER_DAYS = 90;
@ -66,7 +73,7 @@
kyouma.nginx.virtualHosts."git.kyouma.net" = { kyouma.nginx.virtualHosts."git.kyouma.net" = {
locations."/static/".alias = "${pkgs.forgejo.data}/public/"; locations."/static/".alias = "${pkgs.forgejo.data}/public/";
locations."/" = { locations."/" = {
proxyPass = "http://unix:/run/forgejo/forgejo.socket"; proxyPass = "http://unix:/run/forgejo/forgejo.sock";
}; };
}; };
security.acme.certs."git.kyouma.net" = {}; security.acme.certs."git.kyouma.net" = {};

12
config/services/vaultwarden.nix
View file

@ -6,14 +6,12 @@
services.vaultwarden = { services.vaultwarden = {
enable = true; enable = true;
environmentFile = config.sops.secrets."services/vaultwarden/environmentFile".path; environmentFile = config.sops.secrets."services/vaultwarden/environmentFile".path;
backupDir = "/var/backup/bitwarden_rs";
config = { config = {
DATA_FOLDER = "/var/lib/vaultwarden"; DOMAIN = "https://staging.vault.kyouma.net";
DOMAIN = "staging.vault.kyouma.net";
DATABASE_MAX_CONNS = 15; DATABASE_MAX_CONNS = 15;
WEB_VAULT_ENABLED = true; WEB_VAULT_ENABLED = true;
WEBSOCKET_ENABLED = true;
WEBSOCKET_ADDRESS = "::1"; WEBSOCKET_ADDRESS = "::1";
WEBSOCKET_PORT = 3012;
SENDS_ALLOWED = true; SENDS_ALLOWED = true;
ORG_ATTACHMENT_LIMIT = 1048576; ORG_ATTACHMENT_LIMIT = 1048576;
USER_ATTACHMENT_LIMIT = 524288; USER_ATTACHMENT_LIMIT = 524288;
@ -30,13 +28,13 @@
SMTP_USERNAME = "vault@kyouma.net"; SMTP_USERNAME = "vault@kyouma.net";
SMTP_SECURITY = "starttls"; SMTP_SECURITY = "starttls";
SMTP_PORT = 587; SMTP_PORT = 587;
ROCKET_ADDRESS = "unix:/run/vaultwarden/rocket.socket"; ROCKET_ADDRESS = "::1";
ROCKET_PORT = ""; ROCKET_PORT = "8222";
}; };
}; };
kyouma.nginx.virtualHosts."staging.vault.kyouma.net" = { kyouma.nginx.virtualHosts."staging.vault.kyouma.net" = {
locations."/" = { locations."/" = {
proxyPass = "http://unix:/run/vaultwarden/rocket.socket"; proxyPass = "http://[::1]:8222";
proxyWebsockets = true; proxyWebsockets = true;
}; };
}; };