test unix sockets
This commit is contained in:
parent
25d02e5d3a
commit
c9640ad7f5
2 changed files with 35 additions and 25 deletions
|
@ -3,35 +3,40 @@
|
|||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf;
|
||||
inherit (lib) mkIf mkMerge;
|
||||
inherit (lib.attrsets) genAttrs;
|
||||
cfg = config.conf.matrix;
|
||||
in
|
||||
mkIf cfg.enable {
|
||||
services.nginx.virtualHosts = genAttrs [cfg.domain.base cfg.domain.full] (domain: {
|
||||
serverName = domain;
|
||||
useACMEHost = cfg.domain.base;
|
||||
forceSSL = true;
|
||||
locations = {
|
||||
"/.well-known/matrix/server" = {
|
||||
return = "200 '{\"m.server\": \"${cfg.domain.full}:443\"}'";
|
||||
mkIf cfg.enable (mkMerge [
|
||||
{
|
||||
services.nginx.virtualHosts = genAttrs [cfg.domain.base cfg.domain.full] (domain: {
|
||||
serverName = domain;
|
||||
useACMEHost = cfg.domain.base;
|
||||
forceSSL = true;
|
||||
locations = {
|
||||
"/.well-known/matrix/server" = {
|
||||
return = "200 '{\"m.server\": \"${cfg.domain.full}:443\"}'";
|
||||
};
|
||||
"/.well-known/matrix/client" = {
|
||||
return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${cfg.domain.full}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${cfg.domain.full}\"}}'";
|
||||
};
|
||||
"/.well-known/matrix/support" = {
|
||||
return = "200 '{\"contacts\": [{\"matrix_id\": \"@admin:${cfg.domain.full}\", \"email_address\": \"${cfg.email}\", \"role\": \"m.role.admin\"}]}'";
|
||||
};
|
||||
};
|
||||
"/.well-known/matrix/client" = {
|
||||
return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${cfg.domain.full}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${cfg.domain.full}\"}}'";
|
||||
};
|
||||
"/.well-known/matrix/support" = {
|
||||
return = "200 '{\"contacts\": [{\"matrix_id\": \"@admin:${cfg.domain.full}\", \"email_address\": \"${cfg.email}\", \"role\": \"m.role.admin\"}]}'";
|
||||
});
|
||||
|
||||
services.conduwuit = {
|
||||
enable = true;
|
||||
settings.global = {
|
||||
server_name = cfg.domain.full;
|
||||
allow_registration = false;
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
services.conduwuit = {
|
||||
enable = true;
|
||||
settings.global = {
|
||||
server_name = cfg.domain.full;
|
||||
allow_registration = false;
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [8448];
|
||||
}
|
||||
networking.firewall.allowedTCPPorts = [8448];
|
||||
}
|
||||
{
|
||||
services.nginx.virtualHosts.${cfg.domain.full}.locations."/".proxyPass = "http://unix:/run/conduwuit/socket";
|
||||
}
|
||||
])
|
||||
|
|
|
@ -19,4 +19,9 @@ if test -n "$SSH_CLIENT"
|
|||
set ssh (set_color brblack)"$USER@$hostname"
|
||||
end
|
||||
|
||||
set -l git
|
||||
set -l IS_GIT_REPO (command git rev-parse --is-inside-work-tree &>/dev/null)
|
||||
if test -n "$IS_GIT_REPO"
|
||||
end
|
||||
|
||||
string join "" -- $stat $path \n $nix $prompt
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue