refactor
This commit is contained in:
parent
1791e3963c
commit
13ed1f9fd4
3 changed files with 25 additions and 30 deletions
|
@ -6,6 +6,25 @@
|
|||
reverse_proxy /_synapse/* 127.0.0.1:8008
|
||||
'';
|
||||
};
|
||||
frp.settings = {
|
||||
"http.matrix.adtya.xyz" = {
|
||||
type = "http";
|
||||
custom_domains = "matrix.adtya.xyz";
|
||||
local_port = 80;
|
||||
};
|
||||
|
||||
"https.matrix.adtya.xyz" = {
|
||||
type = "https";
|
||||
custom_domains = "matrix.adtya.xyz";
|
||||
local_port = 443;
|
||||
};
|
||||
|
||||
"https.matrix.adtya.xyz.8448" = {
|
||||
type = "tcp";
|
||||
local_port = 8448;
|
||||
remote_port = 8448;
|
||||
};
|
||||
};
|
||||
};
|
||||
systemd.services.dendrite = {
|
||||
description = "Dendrite Matrix homeserver";
|
||||
|
|
|
@ -1,7 +1,4 @@
|
|||
{ pkgs
|
||||
, secrets
|
||||
, ...
|
||||
}:
|
||||
{ secrets, ... }:
|
||||
let
|
||||
inherit (secrets) frp_config;
|
||||
in
|
||||
|
@ -11,10 +8,10 @@ in
|
|||
role = "client";
|
||||
settings = {
|
||||
common = {
|
||||
server_addr = "${frp_config.ip}";
|
||||
server_addr = frp_config.ip;
|
||||
server_port = 7000;
|
||||
authentication_method = "token";
|
||||
token = "${frp_config.token}";
|
||||
token = frp_config.token;
|
||||
};
|
||||
|
||||
"ssh.rico1" = {
|
||||
|
@ -22,24 +19,6 @@ in
|
|||
local_port = 22;
|
||||
remote_port = 6001;
|
||||
};
|
||||
|
||||
"http.matrix.adtya.xyz" = {
|
||||
type = "http";
|
||||
custom_domains = "matrix.adtya.xyz";
|
||||
local_port = 80;
|
||||
};
|
||||
|
||||
"https.matrix.adtya.xyz" = {
|
||||
type = "https";
|
||||
custom_domains = "matrix.adtya.xyz";
|
||||
local_port = 443;
|
||||
};
|
||||
|
||||
"https.matrix.adtya.xyz.8448" = {
|
||||
type = "tcp";
|
||||
local_port = 8448;
|
||||
remote_port = 8448;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,7 +1,4 @@
|
|||
{ pkgs
|
||||
, secrets
|
||||
, ...
|
||||
}:
|
||||
{ secrets, ... }:
|
||||
let
|
||||
inherit (secrets) frp_config;
|
||||
in
|
||||
|
@ -11,10 +8,10 @@ in
|
|||
role = "client";
|
||||
settings = {
|
||||
"common" = {
|
||||
server_addr = "${frp_config.ip}";
|
||||
server_addr = frp_config.ip;
|
||||
server_port = 7000;
|
||||
authentication_method = "token";
|
||||
token = "${frp_config.token}";
|
||||
token = frp_config.token;
|
||||
};
|
||||
|
||||
"ssh.rico2" = {
|
||||
|
|
Loading…
Reference in a new issue