From da8e4b25eb35322661acb68acdf83522fc752adc Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Tue, 30 May 2023 22:23:05 +1000 Subject: [PATCH] helix: make psql dbs from nix --- hosts/profiles/freshrss/default.nix | 6 ++++-- hosts/profiles/gitea/default.nix | 9 +++------ hosts/profiles/woodpecker-server/default.nix | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hosts/profiles/freshrss/default.nix b/hosts/profiles/freshrss/default.nix index 46c6ec19..4c2590b1 100644 --- a/hosts/profiles/freshrss/default.nix +++ b/hosts/profiles/freshrss/default.nix @@ -17,7 +17,6 @@ services.postgresql = { enable = true; # Ensure postgresql is enabled - package = pkgs.postgresql_11; authentication = '' local freshrss all ident map=freshrss-users ''; @@ -26,8 +25,11 @@ freshrss-users freshrss freshrss ''; ensureDatabases = [ "freshrss" ]; + ensureUsers = [ + { name = "freshrss"; ensurePermissions."DATABASE freshrss" = "ALL PRIVILEGES"; } + ]; # TODO - # initialScript # set password for gitea user + # initialScript # set password for freshrss user }; services.nginx.virtualHosts."rss.sealight.xyz" = { diff --git a/hosts/profiles/gitea/default.nix b/hosts/profiles/gitea/default.nix index b4c3613a..936d4945 100644 --- a/hosts/profiles/gitea/default.nix +++ b/hosts/profiles/gitea/default.nix @@ -22,15 +22,14 @@ repository = { DEFAULT_BRANCH = "main"; }; - # TODO "markup.restructuredtext" = { ENABLED = true; FILE_EXTENSIONS = ".rst"; - RENDER_COMMAND = "pandoc +RTS -M512M -RTS -f rst"; + RENDER_COMMAND = "timeout 30s pandoc +RTS -RTS -f rst"; IS_INPUT_FILE = false; }; mailer = { - ENABLED = false; + ENABLED = true; MAILER_TYPE = "smtp"; FROM = "ops@sealight.xyz"; SMTP_ADDR = "smtp.nullhex.com"; @@ -52,7 +51,7 @@ '' gitea-users gitea gitea ''; - # ensureDatabases = [ "gitea" ]; + ensureDatabases = [ "gitea" ]; ensureUsers = [ { name = "gitea"; ensurePermissions."DATABASE gitea" = "ALL PRIVILEGES"; } ]; @@ -74,6 +73,4 @@ }; }; networking.firewall.allowedTCPPorts = [ 80 443 22 ]; - security.acme.defaults.email = "anish+acme@lakhwara.com"; - security.acme.acceptTerms = true; } diff --git a/hosts/profiles/woodpecker-server/default.nix b/hosts/profiles/woodpecker-server/default.nix index 4c7c4bfd..e8357a59 100644 --- a/hosts/profiles/woodpecker-server/default.nix +++ b/hosts/profiles/woodpecker-server/default.nix @@ -52,7 +52,7 @@ "WOODPECKER_DATABASE_DATASOURCE=postgres:///woodpecker?host=/run/postgresql" "WOODPECKER_DATABASE_DRIVER=postgres" - "WOODPECKER_USER_CREATE=username:aynish,admin:true" # set your admin username + "WOODPECKER_ADMIN=aynish" ]; ExecStart = "${pkgs.woodpecker-server}/bin/woodpecker-server"; User = "woodpecker";