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

get conduit running

Browse source
This commit is contained in:
Jade 2023-05-21 14:51:02 +02:00
parent 0980edd187
commit 928f970d55
4 changed files with 25 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

175
flake.lock
View file

@ -20,93 +20,7 @@
"type": "github" "type": "github"
} }
}, },
"conduit": {
"inputs": {
"crane": "crane",
"fenix": "fenix",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1684665691,
"narHash": "sha256-CqZ3ppf05tSFEm6pEbtz4g49pnWbE28jGJ0FdiSXAzE=",
"owner": "famedly",
"repo": "conduit",
"rev": "1f1444da8c41aab6b0014987cac24c8f63a63ba1",
"type": "gitlab"
},
"original": {
"owner": "famedly",
"repo": "conduit",
"type": "gitlab"
}
},
"crane": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": [
"conduit",
"flake-utils"
],
"nixpkgs": [
"conduit",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1680584903,
"narHash": "sha256-uraq+D3jcLzw/UVk0xMHcnfILfIMa0DLrtAEq2nNlxU=",
"owner": "ipetkov",
"repo": "crane",
"rev": "65d3f6a3970cd46bef5eedfd458300f72c56b3c5",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"conduit",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1680607374,
"narHash": "sha256-U5iiPqbAanr+sQCCZ7zxYhwCXdcDpish8Uy4ELZeXM0=",
"owner": "nix-community",
"repo": "fenix",
"rev": "e70d498e97017daa59363eafa054619d4fa160c3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668681692, "lastModified": 1668681692,
@ -144,21 +58,6 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -207,10 +106,10 @@
}, },
"mms": { "mms": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1669478601, "lastModified": 1669478601,
@ -229,7 +128,7 @@
"nix": { "nix": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src", "lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
@ -295,21 +194,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1680652733,
"narHash": "sha256-FFG6Nai9M71C0Uc+D8TxyHoAjTplM0/9uWKsl7ALfUs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cc5bde408572508efd1273852862d418bb313443",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1657693803, "lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
@ -325,7 +209,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1669378442, "lastModified": 1669378442,
"narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=",
@ -341,7 +225,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1684580438, "lastModified": 1684580438,
"narHash": "sha256-LUPswmDn6fXP3lEBJFA2Id8PkcYDgzUilevWackYVvQ=", "narHash": "sha256-LUPswmDn6fXP3lEBJFA2Id8PkcYDgzUilevWackYVvQ=",
@ -360,55 +244,10 @@
"root": { "root": {
"inputs": { "inputs": {
"arion": "arion", "arion": "arion",
"conduit": "conduit",
"mms": "mms", "mms": "mms",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixpkgsUnstable": "nixpkgsUnstable" "nixpkgsUnstable": "nixpkgsUnstable"
} }
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1680435407,
"narHash": "sha256-IPBtZCOh3BdrR+V77cL7r6WQnclWcZ/85BDYnmq/GnQ=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "236576227a299fd19ba836b1834ab50c948af994",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"conduit",
"crane",
"flake-utils"
],
"nixpkgs": [
"conduit",
"crane",
"nixpkgs"
]
},
"locked": {
"lastModified": 1680488274,
"narHash": "sha256-0vYMrZDdokVmPQQXtFpnqA2wEgCCUXf5a3dDuDVshn0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "7ec2ff598a172c6e8584457167575b3a1a5d80d8",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

6
flake.nix
View file

@ -5,9 +5,9 @@
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
arion.url = "github:hercules-ci/arion"; arion.url = "github:hercules-ci/arion";
mms.url = "github:mkaito/nixos-modded-minecraft-servers"; mms.url = "github:mkaito/nixos-modded-minecraft-servers";
conduit = { # conduit = {
url = "gitlab:famedly/conduit"; # url = "gitlab:famedly/conduit";
}; # };
}; };
outputs = { self, nixpkgs, nixpkgsUnstable, ... }@inputs: outputs = { self, nixpkgs, nixpkgsUnstable, ... }@inputs:

14
modules/conduit.nix
View file

@ -1,6 +1,5 @@
{ config { config
, pkgs , pkgsUnstable
, inputs
, ... , ...
}: }:
@ -8,7 +7,7 @@ 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 = "matrix.katzen.cafe"; server_name = "katzen.cafe";
# The hostname that Conduit actually runs on # The hostname that Conduit actually runs on
# #
@ -24,14 +23,14 @@ let
# These ones you can leave alone # These ones you can leave alone
# Build a dervation that stores the content of `${server_name}/.well-known/matrix/server` # Build a dervation that stores the content of `${server_name}/.well-known/matrix/server`
well_known_server = pkgs.writeText "well-known-matrix-server" '' well_known_server = pkgsUnstable.writeText "well-known-matrix-server" ''
{ {
"m.server": "${matrix_hostname}" "m.server": "${matrix_hostname}"
} }
''; '';
# Build a dervation that stores the content of `${server_name}/.well-known/matrix/client` # Build a dervation that stores the content of `${server_name}/.well-known/matrix/client`
well_known_client = pkgs.writeText "well-known-matrix-client" '' well_known_client = pkgsUnstable.writeText "well-known-matrix-client" ''
{ {
"m.homeserver": { "m.homeserver": {
"base_url": "https://${matrix_hostname}" "base_url": "https://${matrix_hostname}"
@ -46,11 +45,12 @@ in
enable = true; enable = true;
# This causes NixOS to use the flake defined in this repository instead of # This causes NixOS to use the flake defined in this repository instead of
# the build of Conduit built into nixpkgs. # the build of Conduit built into nixpkgsUnstable.
package = inputs.conduit.packages.${pkgs.system}.default; package = pkgsUnstable.matrix-conduit;
settings.global = { settings.global = {
inherit server_name; inherit server_name;
allow_registration = false;
}; };
}; };

16
modules/proxy.nix
View file

@ -35,14 +35,14 @@
group = "murmur"; group = "murmur";
keyType = "rsa4096"; keyType = "rsa4096";
}; };
"prosody.katzen.cafe" = { # "prosody.katzen.cafe" = {
group = "prosody"; # group = "prosody";
keyType = "rsa4096"; # keyType = "rsa4096";
extraDomainNames = [ # extraDomainNames = [
"uploads.prosody.katzen.cafe" # "uploads.prosody.katzen.cafe"
"conference.prosody.katzen.cafe" # "conference.prosody.katzen.cafe"
]; # ];
}; # };
}; };
}; };
services.nginx = { services.nginx = {