felixalb/nixos-config
felixalb
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update flake, fix gitea

This commit is contained in:
Felix Albrigtsen 2023-08-18 19:02:07 +02:00
parent c266d7f1db
commit b3bf98d396
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
flake.lock
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687871164, "lastModified": 1692099905,
"narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -46,11 +46,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691640097, "lastModified": 1691963303,
"narHash": "sha256-6vPsJYjtt2hs4mkiR46yt8c/Spdm/UiUKoSCIlc7iJw=", "narHash": "sha256-zqvt4N4Ic06BrGo02itCIPTEKzVnGT0BtGbIr+aUGqE=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "426d38710b656b0a31f8eaae6e0002206a3b96d7", "rev": "3fcd83783a1e2ddad0f14821da4186a95bc76c50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,11 +62,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1691693223, "lastModified": 1692134936,
"narHash": "sha256-9t8ZY1XNAsWqxAJmXgg+GXqF5chORMVnBT6PSHaRV3I=", "narHash": "sha256-Z68O969cioC6I3k/AFBxsuEwpJwt4l9fzwuAMUhCCs0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18784aac1013da9b442adf29b6c7c228518b5d3f", "rev": "bfd953b2c6de4f550f75461bcc5768b6f966be10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +125,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1691895982, "lastModified": 1692127428,
"narHash": "sha256-wScqSv0ZKlt11ST9t5/KUhnCr2S1sg9KcRte7MZUVa8=", "narHash": "sha256-+e9dD67mpGLBhhqdv7A7i1g/r2AT/PmqthWaYHyVZR4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "9d812be0a8ad4f22a6467c7dbc403d1af7c4655a", "rev": "f81e73cf9a4ef4b949b9225be3daa1e586c096da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +140,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1691654369, "lastModified": 1692174805,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
hosts/voyager/services/gitea.nix
View File

@ -1,9 +1,9 @@
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
let let
cfg = config.services.gitea; cfg = config.services.gitea;
domain = "git.feal.no"; domain = "git.feal.no";
httpPort = 3004; httpPort = 3004;
sshPort = 2222; /* sshPort = 2222; */
in { in {
services.gitea = { services.gitea = {
enable = true; enable = true;
@ -17,7 +17,7 @@ in {
server = { server = {
LANDING_PAGE=''"/felixalb"''; LANDING_PAGE=''"/felixalb"'';
HTTP_PORT = httpPort; HTTP_PORT = httpPort;
SSH_PORT = sshPort; /* SSH_PORT = sshPort; */
SSH_DOMAIN = "voyager.home.feal.no"; SSH_DOMAIN = "voyager.home.feal.no";
DOMAIN = domain; DOMAIN = domain;
ROOT_URL = "https://${domain}"; ROOT_URL = "https://${domain}";
@ -27,6 +27,7 @@ in {
session.COOKIE_SECURE = true; session.COOKIE_SECURE = true;
packages.ENABLED = false; packages.ENABLED = false;
packages.CHUNKED_UPLOAD_PATH = "${cfg.stateDir}/tmp/package-upload";
oauth2_client = { oauth2_client = {
ENABLE_AUTO_REGISTRATION = true; ENABLE_AUTO_REGISTRATION = true;
@ -51,5 +52,8 @@ in {
# - configure mailer # - configure mailer
}; };
networking.firewall.allowedTCPPorts = [ httpPort sshPort ]; systemd.services.gitea.serviceConfig.WorkingDirectory = lib.mkForce "/var/lib/gitea/work";
networking.firewall.allowedTCPPorts = [ httpPort ];
/* networking.firewall.allowedTCPPorts = [ httpPort sshPort ]; */
} }