qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flake: update ts-reverse-proxy

Browse Source
This commit is contained in:
Aaron Bieber 2024-06-28 09:48:05 -06:00
parent 6505bbb4ae
commit 4dfe892a41
No known key found for this signature in database
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.lock generated
View File

@ -409,7 +409,7 @@
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stable": "stable", "stable": "stable",
"traygent": "traygent", "traygent": "traygent",
"tsRevProx": "tsRevProx", "ts-reverse-proxy": "ts-reverse-proxy",
"tsvnstat": "tsvnstat", "tsvnstat": "tsvnstat",
"unstable": "unstable", "unstable": "unstable",
"unstableSmall": "unstableSmall", "unstableSmall": "unstableSmall",
@ -546,18 +546,18 @@
"type": "github" "type": "github"
} }
}, },
"tsRevProx": { "ts-reverse-proxy": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"unstable" "unstable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1718734761, "lastModified": 1719582611,
"narHash": "sha256-pzzq+tTx6Pp5BqulZjcVrnxbqBe91aYfS4tKkI/VULg=", "narHash": "sha256-w1JrCWzygoUb52teJ3M59YMi0+as2vkQmnyU70Pd17w=",
"owner": "qbit", "owner": "qbit",
"repo": "ts-reverse-proxy", "repo": "ts-reverse-proxy",
"rev": "ba7b61a85bb2291bd4972dc5f89b647b523c9284", "rev": "f537ecf2328c2486f12a4cc42a5d3c768cbca4f4",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@ -91,7 +91,7 @@
url = "github:qbit/po"; url = "github:qbit/po";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
tsRevProx = { ts-reverse-proxy = {
url = "github:qbit/ts-reverse-proxy"; url = "github:qbit/ts-reverse-proxy";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
@ -116,7 +116,7 @@
, pots , pots
, pr-status , pr-status
, stable , stable
, tsRevProx , ts-reverse-proxy
, traygent , traygent
, tsvnstat , tsvnstat
, unstable , unstable
@ -163,7 +163,7 @@
inputs.microca.overlay inputs.microca.overlay
inputs.pots.overlay inputs.pots.overlay
inputs.pr-status.overlay inputs.pr-status.overlay
inputs.tsRevProx.overlay inputs.ts-reverse-proxy.overlay
]; ];
buildSys = sys: sysBase: extraMods: name: buildSys = sys: sysBase: extraMods: name:
@ -342,7 +342,7 @@
inherit (tsvnstat.packages.${system}) tsvnstat; inherit (tsvnstat.packages.${system}) tsvnstat;
inherit (pots.packages.${system}) pots; inherit (pots.packages.${system}) pots;
inherit (po.packages.${system}) po; inherit (po.packages.${system}) po;
inherit (tsRevProx.packages.${system}) ts-reverse-proxy; inherit (ts-reverse-proxy.packages.${system}) ts-reverse-proxy;
inherit (traygent.packages.${system}) traygent; inherit (traygent.packages.${system}) traygent;
inherit (spkgs) matrix-synapse; inherit (spkgs) matrix-synapse;

12
modules/ts-reverse-proxy.nix
View File

@ -44,6 +44,14 @@ in
''; '';
}; };
hostHeader = mkOption {
type = types.str;
default = "";
description = ''
Manually set the Host header
'';
};
user = mkOption { user = mkOption {
type = with types; oneOf [ str int ]; type = with types; oneOf [ str int ];
default = name; default = name;
@ -99,7 +107,9 @@ in
(name: conf: nameValuePair name { (name: conf: nameValuePair name {
description = "ts-reverse-proxy instance ${name}"; description = "ts-reverse-proxy instance ${name}";
enable = true; enable = true;
after = [ "network-online.target" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
environment = { HOME = "${conf.dataDir}"; }; environment = { HOME = "${conf.dataDir}"; };
@ -107,7 +117,7 @@ in
User = conf.user; User = conf.user;
Group = conf.group; Group = conf.group;
ExecStart = "${cfg.package}/bin/ts-reverse-proxy -name ${conf.reverseName} -port ${ ExecStart = "${cfg.package}/bin/ts-reverse-proxy ${lib.optionalString (conf.hostHeader != "") "-host-header '${conf.hostHeader}'"} -name ${conf.reverseName} -port ${
toString conf.reversePort toString conf.reversePort
} -ip ${conf.reverseIP}"; } -ip ${conf.reverseIP}";
#EnvironmentFile = conf.envFile; #EnvironmentFile = conf.envFile;