Removed new nginx entry; fixed mautrix discord
This commit is contained in:
@@ -17,7 +17,9 @@
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.mautrix-discord-env = {
|
||||
systemd = {
|
||||
services = {
|
||||
mautrix-discord-env = {
|
||||
before = [ "mautrix-discord-registration.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
@@ -34,7 +36,15 @@
|
||||
'';
|
||||
};
|
||||
|
||||
services.postgresql = {
|
||||
mautrix-discord-registration.serviceConfig.UMask = lib.mkForce "0750";
|
||||
};
|
||||
tmpfiles.rules = [
|
||||
"z /var/lib/mautrix-discord/discord-registration.yaml 0640 mautrix-discord mautrix-discord -"
|
||||
];
|
||||
};
|
||||
|
||||
services = {
|
||||
postgresql = {
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "mautrix-discord";
|
||||
@@ -42,9 +52,8 @@
|
||||
}
|
||||
];
|
||||
ensureDatabases = [ "mautrix-discord" ];
|
||||
};
|
||||
|
||||
services.mautrix-discord = {
|
||||
mautrix-discord = {
|
||||
enable = true;
|
||||
environmentFile = "/run/mautrix-discord/env";
|
||||
settings = {
|
||||
@@ -90,5 +99,8 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
systemd.services.mautrix-discord-registration.serviceConfig.UMask = lib.mkForce "0022";
|
||||
};
|
||||
};
|
||||
|
||||
users.users.matrix-synapse.extraGroups = [ "mautrix-discord" ];
|
||||
}
|
||||
|
||||
+10
-10
@@ -74,16 +74,16 @@ in
|
||||
"calvin.cyperpunk.de" = mkWsProxy 15006;
|
||||
"auth.cyperpunk.de" = mkHttpsProxy 8444;
|
||||
|
||||
"home.cyperpunk.de" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = "/var/www/home.cyperpunk.de";
|
||||
extraConfig = ''
|
||||
try_files $uri $uri/ =404;
|
||||
'';
|
||||
};
|
||||
};
|
||||
#"home.cyperpunk.de" = {
|
||||
# forceSSL = true;
|
||||
# enableACME = true;
|
||||
# locations."/" = {
|
||||
# root = "/var/www/home.cyperpunk.de";
|
||||
# extraConfig = ''
|
||||
# try_files $uri $uri/ =404;
|
||||
# '';
|
||||
# };
|
||||
#};
|
||||
|
||||
"www.cyperpunk.de" = {
|
||||
forceSSL = true;
|
||||
|
||||
Reference in New Issue
Block a user