batteredbunny/server.nix
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity Actions

Add confess web, rename forge option

Browse source
This commit is contained in:
batteredbunny 2024-06-08 16:41:43 +03:00
parent 6f8af704bc
commit ed5ddae901
5 changed files with 102 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
caddy.nix
View file

@ -229,6 +229,9 @@ in
"plex.catnip.ee".extraConfig = ''
reverse_proxy :${toString settings.ports.plex}
'';
"confess.catnip.ee".extraConfig = ''
reverse_proxy :${toString settings.ports.confess}
'';
":80".extraConfig = ''
respond awawaw

10
configuration.nix
View file

@ -12,6 +12,7 @@
./caddy.nix
./gui.nix
inputs.lastfm-status.nixosModules.${system}.default
inputs.confess.nixosModules.${system}.default
inputs.common-modules.nixosModules.nixos-upgrade
inputs.common-modules.nixosModules.qbittorrent-nox
inputs.common-modules.nixosModules.unpackerr
@ -252,6 +253,13 @@
};
services = {
confess-web = {
enable = true;
port = settings.ports.confess;
reverseProxy = true;
trustedProxy = "127.0.0.1";
environmentFile = "/etc/secrets/confess.env";
};
drasl = {
enable = true;
settings = {
@ -397,7 +405,7 @@
forgejo = {
enable = true;
database.type = "postgres";
mailerPasswordFile = "/etc/secrets/forge-email";
secrets.mailer.PASSWD = "/etc/secrets/forge-email";
settings = {
server = {
DOMAIN = "forge.catnip.ee";

107
flake.lock generated
View file

@ -44,11 +44,11 @@
]
},
"locked": {
"lastModified": 1717449102,
"narHash": "sha256-g12zykyQfi581WGmD5LXBphYUxg9zk5YG/7+7+TlXII=",
"lastModified": 1717708220,
"narHash": "sha256-c3M7aU0L6aMYRgxTKuZF1PJPQF9jnmSw/dWgwEynj6o=",
"ref": "refs/heads/main",
"rev": "10713d2dbb02ad0c95f7a1e1297c8aba24b68b04",
"revCount": 33,
"rev": "17b7ecdb1c3d07e1d3f8118b3daf5e4a5a9f55eb",
"revCount": 34,
"type": "git",
"url": "https://forge.catnip.ee/batteredbunny/common.nix"
},
@ -57,10 +57,29 @@
"url": "https://forge.catnip.ee/batteredbunny/common.nix"
}
},
"confess": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1717863076,
"narHash": "sha256-Y4tVD1hSOPFjLplVWsmt7aTUwmRrWbzFsup7CvA9kfM=",
"ref": "refs/heads/main",
"rev": "53f6481b36b7a4e0753587f067d2c48515301e43",
"revCount": 4,
"type": "git",
"url": "ssh://forgejo@forge.catnip.ee:2222/batteredbunny/confess"
},
"original": {
"type": "git",
"url": "ssh://forgejo@forge.catnip.ee:2222/batteredbunny/confess"
}
},
"drasl": {
"inputs": {
"buildNodeModules": "buildNodeModules",
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1716497918,
@ -114,6 +133,24 @@
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
@ -130,8 +167,8 @@
},
"lastfm-status": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2"
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1712134258,
@ -150,15 +187,15 @@
"nix-minecraft": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3"
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1717637028,
"narHash": "sha256-QLHg3C6oj+kLJ9Dg+tNVTUU+kwIfzrwhM04n3Zl2uhI=",
"lastModified": 1717809842,
"narHash": "sha256-AENeVwzmeB/5ZS+egb/XEkHMUsTnCHg3MptoIutdxn4=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "e3e4354002c41f8ec7fbd9631ab6c3bdc9b6a593",
"rev": "0693fd45e80be1e1ff6580e750ce589268fb089d",
"type": "github"
},
"original": {
@ -168,6 +205,22 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1715218190,
"narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=",
@ -182,7 +235,7 @@
"type": "indirect"
}
},
"nixpkgs_2": {
"nixpkgs_3": {
"locked": {
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
@ -198,7 +251,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1715266358,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@ -214,13 +267,13 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1717196966,
"narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
"owner": "Nixos",
"repo": "nixpkgs",
"rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
"type": "github"
},
"original": {
@ -234,10 +287,11 @@
"inputs": {
"catnip-website": "catnip-website",
"common-modules": "common-modules",
"confess": "confess",
"drasl": "drasl",
"lastfm-status": "lastfm-status",
"nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_5"
}
},
"systems": {
@ -269,6 +323,21 @@
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

1
flake.nix
View file

@ -12,6 +12,7 @@
url = "git+https://forge.catnip.ee/batteredbunny/common.nix";
inputs.nixpkgs.follows = "nixpkgs";
};
confess.url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/confess";
drasl.url = "github:unmojang/drasl";
};

1
settings.nix
View file

@ -7,6 +7,7 @@
server_configs_home = "/home/owo/Documents/server_configs";
ports = {
confess = 8011;
matrix-sliding-sync = 8010;
mautrix-telegram = 8009;
synapse = 8008;