schrottkatze/katzen-cafe
0
0
Fork 0
mirror of https://forge.katzen.cafe/katzen-cafe/katzen-cafe.git synced 2025-12-23 07:47:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: schrottkatze:7d126b7bda288308ddc2de5435a2ddccfbf48d98
Branches Tags
schrottkatze:main
..
compare: schrottkatze:bb42108d577d48ce5f7df185da841e42aa5ac9d5
Branches Tags
schrottkatze:main

No commits in common. "7d126b7bda288308ddc2de5435a2ddccfbf48d98" and "bb42108d577d48ce5f7df185da841e42aa5ac9d5" have entirely different histories.
7d126b7bda ... bb42108d57

3 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

46
flake.lock generated
View file

@ -8,11 +8,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1713728172,
"narHash": "sha256-rac5WwUyZGxVqcNh2PIOxXJFGPXBSFPfkox1AdqwVgk=",
"lastModified": 1712285456,
"narHash": "sha256-A4EBTlFfeosNaO8zpN7rlWTgF9AHy755NxKBvhJ1b0w=",
"owner": "hercules-ci",
"repo": "arion",
"rev": "add0e67d2b83814667490985ea4ef1226d3b4511",
"rev": "1886d25075aaf24c8bc687b3d2a87ae1f5d154ec",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1713731448,
"narHash": "sha256-IDZfplo83qIi66Vpq1bqwwhm9FNs+6xW3d6EhMBGNCk=",
"lastModified": 1712846257,
"narHash": "sha256-UFHyLlCm0bHI2TMwIQJn/BrXQTTr7NtLIogEvNCOS8Y=",
"owner": "famedly",
"repo": "conduit",
"rev": "27753b1d9624fc7a295eaf6009b71ede5804de62",
"rev": "7f63948db9b6631e1d1e791ca1fce3413d2a0734",
"type": "gitlab"
},
"original": {
@ -114,17 +114,17 @@
]
},
"locked": {
"lastModified": 1713721181,
"narHash": "sha256-Vz1KRVTzU3ClBfyhOj8gOehZk21q58T1YsXC30V23PU=",
"lastModified": 1707685877,
"narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=",
"owner": "ipetkov",
"repo": "crane",
"rev": "55f4939ac59ff8f89c6a4029730a2d49ea09105f",
"rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
"type": "github"
},
"original": {
"owner": "ipetkov",
"ref": "master",
"repo": "crane",
"rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
"type": "github"
}
},
@ -416,11 +416,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1713537308,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
"lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github"
},
"original": {
@ -494,27 +494,27 @@
},
"nixpkgsOld": {
"locked": {
"lastModified": 1713725259,
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=",
"lastModified": 1688392541,
"narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7",
"rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgsUnstable": {
"locked": {
"lastModified": 1713714899,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"lastModified": 1712791164,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"type": "github"
},
"original": {
@ -590,11 +590,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1713725259,
"narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=",
"lastModified": 1712867921,
"narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7",
"rev": "51651a540816273b67bc4dedea2d37d116c5f7fe",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -1,6 +1,6 @@
{
inputs = {
nixpkgsOld.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgsOld.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

30
modules/conduit.nix
View file

@ -1,10 +1,12 @@
{
config,
pkgsUnstable,
inputs,
...
}: let
{ config
, pkgsUnstable
, inputs
, ...
}:
let
# You'll need to edit these values
# The hostname that will appear in your user and room IDs
server_name = "katzen.cafe";
@ -33,13 +35,12 @@
{
"m.homeserver": {
"base_url": "https://${matrix_hostname}"
},
"org.matrix.msc3575.proxy": {
"url": "https://${matrix_hostname}"
}
}
'';
in {
in
{
# Configure Conduit itself
services.matrix-conduit = {
enable = true;
@ -93,8 +94,7 @@ in {
addr = "[::]";
port = 443;
ssl = true;
}
{
} {
addr = "0.0.0.0";
port = 8448;
ssl = true;
@ -152,13 +152,13 @@ in {
upstreams = {
"backend_conduit" = {
servers = {
"[::1]:${toString config.services.matrix-conduit.settings.global.port}" = {};
"[::1]:${toString config.services.matrix-conduit.settings.global.port}" = { };
};
};
};
};
# Open firewall ports for HTTP, HTTPS, and Matrix federation
networking.firewall.allowedTCPPorts = [80 443 8448];
networking.firewall.allowedUDPPorts = [80 443 8448];
networking.firewall.allowedTCPPorts = [ 80 443 8448 ];
networking.firewall.allowedUDPPorts = [ 80 443 8448 ];
}