schrottkatze/katzen-cafe
1
0
Fork 0
mirror of https://forge.katzen.cafe/katzen-cafe/katzen-cafe.git synced 2024-11-05 15:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

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

4 commits
bb42108d57 ... 7d126b7bda

Author SHA1 Message Date
Schrottkatze 7d126b7bda
idk get sliding sync stuffs working 2024-05-01 17:57:28 +02:00
Schrottkatze 536ed2f421
update that fkin wiki 2024-05-01 17:57:10 +02:00
Schrottkatze 6e23418e21
flake.lock: Update 
Flake lock file updates:

• Updated input 'arion':
    'github:hercules-ci/arion/1886d25075aaf24c8bc687b3d2a87ae1f5d154ec' (2024-04-05)
  → 'github:hercules-ci/arion/add0e67d2b83814667490985ea4ef1226d3b4511' (2024-04-21)
• Updated input 'arion/nixpkgs':
    'github:NixOS/nixpkgs/fd281bd6b7d3e32ddfa399853946f782553163b5' (2024-04-03)
  → 'github:NixOS/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19)
• Updated input 'conduit':
    'gitlab:famedly/conduit/d22bf5182becfb31e8f4251832ec3ed08d61cfbd' (2024-04-15)
  → 'gitlab:famedly/conduit/27753b1d9624fc7a295eaf6009b71ede5804de62' (2024-04-21)
• Updated input 'conduit/crane':
    'github:ipetkov/crane/2c653e4478476a52c6aa3ac0495e4dea7449ea0e' (2024-02-11)
  → 'github:ipetkov/crane/55f4939ac59ff8f89c6a4029730a2d49ea09105f' (2024-04-21)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/53a2c32bc66f5ae41a28d7a9a49d321172af621e' (2024-04-15)
  → 'github:NixOS/nixpkgs/a5e4bbcb4780c63c79c87d29ea409abf097de3f7' (2024-04-21)
• Updated input 'nixpkgsOld':
    'github:NixOS/nixpkgs/53a2c32bc66f5ae41a28d7a9a49d321172af621e' (2024-04-15)
  → 'github:NixOS/nixpkgs/a5e4bbcb4780c63c79c87d29ea409abf097de3f7' (2024-04-21)
• Updated input 'nixpkgsUnstable':
    'github:NixOS/nixpkgs/cfd6b5fc90b15709b780a5a1619695a88505a176' (2024-04-12)
  → 'github:NixOS/nixpkgs/6143fc5eeb9c4f00163267708e26191d1e918932' (2024-04-21)
 2024-04-23 19:52:46 +02:00
Schrottkatze 2cf6634a20
flake.lock: Update 
Flake lock file updates:

• Updated input 'conduit':
    'gitlab:famedly/conduit/7f63948db9b6631e1d1e791ca1fce3413d2a0734' (2024-04-11)
  → 'gitlab:famedly/conduit/d22bf5182becfb31e8f4251832ec3ed08d61cfbd' (2024-04-15)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/51651a540816273b67bc4dedea2d37d116c5f7fe' (2024-04-11)
  → 'github:NixOS/nixpkgs/53a2c32bc66f5ae41a28d7a9a49d321172af621e' (2024-04-15)
• Updated input 'nixpkgsUnstable':
    'github:NixOS/nixpkgs/1042fd8b148a9105f3c0aca3a6177fd1d9360ba5' (2024-04-10)
  → 'github:NixOS/nixpkgs/cfd6b5fc90b15709b780a5a1619695a88505a176' (2024-04-12)
 2024-04-16 17:20:45 +02:00
3 changed files with 39 additions and 39 deletions
Show stats Expand all files Collapse all files

46
flake.lock
View file

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

2
flake.nix
View file

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

30
modules/conduit.nix
View file

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