diff --git a/modules/server/biggoron/default.nix b/modules/server/biggoron/default.nix index a2ae503..efef8da 100644 --- a/modules/server/biggoron/default.nix +++ b/modules/server/biggoron/default.nix @@ -1,16 +1,10 @@ -{ lib, config, ... }: +{ lib, config, pkgs, ... }: let cfg = config.services.forgejo; srv = cfg.settings.server; in { - services.openssh = { - ports = [ - 22 - 2222 - ]; - settings.AcceptEnv = "GIT_PROTOCOL"; - }; + services.openssh.settings.AcceptEnv = "GIT_PROTOCOL"; # Fixing mailing issues systemd.services.forgejo.serviceConfig = { @@ -26,6 +20,7 @@ in services.forgejo = { enable = true; + # package = pkgs.forgejo; # I don't understand why the fuck the user needs to be the same as the db's # user = "biggoron"; @@ -46,7 +41,7 @@ in # You need to specify this to remove the port from URLs in the web UI. ROOT_URL = "https://${srv.DOMAIN}/"; HTTP_PORT = 44303; - SSH_PORT = 2222; + SSH_PORT = 22; }; # You can temporarily allow registration to create an admin user.