updates
This commit is contained in:
parent
448b9e7439
commit
c5bc2e1a19
8 changed files with 221 additions and 184 deletions
|
@ -48,11 +48,12 @@ in {
|
|||
aliases = [
|
||||
"postmaster@0x76.dev"
|
||||
"abuse@0x76.dev"
|
||||
|
||||
"v@meowy.tech"
|
||||
"abuse@meowy.tech"
|
||||
"postmaster@meowy.tech"
|
||||
"abuse@xirion.net"
|
||||
"postmaster@xirion.net"
|
||||
|
||||
"@meowy.tech"
|
||||
"@xirion.net"
|
||||
"@0x76.dev"
|
||||
];
|
||||
|
|
|
@ -3,8 +3,10 @@
|
|||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
let mosquittoPort = 1883;
|
||||
in {
|
||||
let
|
||||
mosquittoPort = 1883;
|
||||
in
|
||||
{
|
||||
imports = [ ];
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
|
@ -20,15 +22,21 @@ in {
|
|||
|
||||
services.mosquitto = {
|
||||
enable = true;
|
||||
listeners = [{
|
||||
port = mosquittoPort;
|
||||
settings.allow_anonymous = true;
|
||||
acl = [ "topic readwrite #" ];
|
||||
users = {
|
||||
vivian = { acl = [ "readwrite #" ]; };
|
||||
zigbee2mqtt = { acl = [ "readwrite #" ]; };
|
||||
};
|
||||
}];
|
||||
listeners = [
|
||||
{
|
||||
port = mosquittoPort;
|
||||
settings.allow_anonymous = true;
|
||||
acl = [ "topic readwrite #" ];
|
||||
users = {
|
||||
vivian = {
|
||||
acl = [ "readwrite #" ];
|
||||
};
|
||||
zigbee2mqtt = {
|
||||
acl = [ "readwrite #" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
|
@ -39,7 +47,9 @@ in {
|
|||
homeassistant = true;
|
||||
permit_join = false;
|
||||
|
||||
serial = { port = "/dev/ttyUSB0"; };
|
||||
serial = {
|
||||
port = "/dev/ttyUSB0";
|
||||
};
|
||||
|
||||
mqtt = {
|
||||
base_topic = "zigbee2mqtt";
|
||||
|
@ -47,10 +57,14 @@ in {
|
|||
user = "zigbee2mqtt";
|
||||
};
|
||||
|
||||
frontend = { port = 8080; };
|
||||
frontend = {
|
||||
port = 8080;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts =
|
||||
[ mosquittoPort config.services.zigbee2mqtt.settings.frontend.port ];
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
mosquittoPort
|
||||
config.services.zigbee2mqtt.settings.frontend.port
|
||||
];
|
||||
}
|
||||
|
|
|
@ -5,9 +5,9 @@ let
|
|||
base_url = "https://chat.meowy.tech";
|
||||
server_name = "meowy.tech";
|
||||
};
|
||||
"org.matrix.msc3575.proxy" = {
|
||||
"url" = "https://sliding-chat.meowy.tech";
|
||||
};
|
||||
# "org.matrix.msc3575.proxy" = {
|
||||
# "url" = "https://sliding-chat.meowy.tech";
|
||||
# };
|
||||
};
|
||||
serverConfig."m.server" = "chat.meowy.tech:443";
|
||||
mkWellKnown = data: ''
|
||||
|
@ -127,7 +127,7 @@ in
|
|||
return 303 https://element.chat.meowy.tech;
|
||||
'';
|
||||
"= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig;
|
||||
"= /_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://synapse.olympus:8009";
|
||||
# "= /_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://synapse.olympus:8009";
|
||||
"/_matrix".proxyPass = "http://synapse.olympus:8008";
|
||||
"/_synapse/client".proxyPass = "http://synapse.olympus:8008";
|
||||
"/_synapse/admin" = {
|
||||
|
@ -146,11 +146,11 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
"sliding-chat.meowy.tech" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/".proxyPass = "http://synapse.olympus:8009";
|
||||
};
|
||||
# "sliding-chat.meowy.tech" = {
|
||||
# enableACME = true;
|
||||
# forceSSL = true;
|
||||
# locations."/".proxyPass = "http://synapse.olympus:8009";
|
||||
# };
|
||||
"element.chat.meowy.tech" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
|
|
@ -43,7 +43,7 @@ in
|
|||
};
|
||||
|
||||
services.matrix-sliding-sync = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
createDatabase = true;
|
||||
environmentFile = "${vs.synapse}/sync";
|
||||
settings = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue