matrix foo
This commit is contained in:
parent
0357003655
commit
cd2b61f1fb
4 changed files with 20 additions and 22 deletions
16
flake.nix
16
flake.nix
|
|
@ -165,6 +165,22 @@
|
||||||
./hosts/monitoring
|
./hosts/monitoring
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
nixosConfigurations."www" = nixpkgs.lib.nixosSystem {
|
||||||
|
#system = "x86_64-linux";
|
||||||
|
#pkgs = import nixpkgs { inherit system; };
|
||||||
|
inherit system;
|
||||||
|
modules = [
|
||||||
|
./hosts/www
|
||||||
|
];
|
||||||
|
};
|
||||||
|
nixosConfigurations."git-run" = nixpkgs.lib.nixosSystem {
|
||||||
|
#system = "x86_64-linux";
|
||||||
|
#pkgs = import nixpkgs { inherit system; };
|
||||||
|
inherit system;
|
||||||
|
modules = [
|
||||||
|
./hosts/git-run
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
#);
|
#);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/virtualisation/proxmox-lxc.nix")
|
(modulesPath + "/virtualisation/proxmox-lxc.nix")
|
||||||
../../services/node-exporter.nix
|
../services/node-exporter.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.suppressedSystemUnits = [
|
systemd.suppressedSystemUnits = [
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,6 @@
|
||||||
./nginx.nix
|
./nginx.nix
|
||||||
./synapse.nix
|
./synapse.nix
|
||||||
./draupnir.nix
|
./draupnir.nix
|
||||||
../../services/postgres.nix
|
|
||||||
../../services/prometheus.nix
|
|
||||||
../../services/grafana.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
|
|
||||||
let
|
|
||||||
domain = "berlin.ccc.de";
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
networking.firewall.extraInputRules = ''
|
networking.firewall.extraInputRules = ''
|
||||||
ip saddr 195.160.173.14 tcp dport 9009 accept
|
ip saddr 195.160.173.14 tcp dport 9009 accept
|
||||||
|
|
@ -13,9 +10,9 @@ in
|
||||||
matrix-synapse = {
|
matrix-synapse = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
server_name = domain;
|
server_name = config.networking.domain;
|
||||||
public_baseurl = "https://matrix.${domain}:443/";
|
public_baseurl = "https://${config.networking.hostName}.${config.networking.domain}:443/";
|
||||||
# "/var/lib/matrix-synapse/homeserver.signing.key"
|
# Creates "/var/lib/matrix-synapse/homeserver.signing.key" on first launch
|
||||||
signing_key_path = config.age.secrets.matrix_signing_key.path;
|
signing_key_path = config.age.secrets.matrix_signing_key.path;
|
||||||
registration_shared_secret_path = config.age.secrets.matrix_registration_shared_secret.path;
|
registration_shared_secret_path = config.age.secrets.matrix_registration_shared_secret.path;
|
||||||
database = {
|
database = {
|
||||||
|
|
@ -73,17 +70,5 @@ in
|
||||||
};
|
};
|
||||||
enableRegistrationScript = true;
|
enableRegistrationScript = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
postgresql = {
|
|
||||||
ensureUsers = [
|
|
||||||
{
|
|
||||||
name = config.services.matrix-synapse.settings.database.args.user;
|
|
||||||
ensureDBOwnership = true;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
ensureDatabases = [
|
|
||||||
config.services.matrix-synapse.settings.database.args.database
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue