Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

module: make services/proxy a profile

Browse source
This commit is contained in:
Infinidoge 2022-04-20 09:05:13 -04:00
parent 9cb9e702aa
commit 3b54e3ba95
3 changed files with 28 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/Infini-FRAMEWORK/default.nix
View file

@ -4,6 +4,7 @@
(with profiles; [
networking.wireless
services.proxy
])
./hardware-configuration.nix
@ -45,9 +46,6 @@
fprint-sensor.enable = true;
};
};
services = {
proxy.enable = true;
};
filesystems = {
enable = true;
btrfs.enable = true;

41
modules/modules/services/proxy.nix
View file

@ -1,41 +0,0 @@
{ config, lib, ... }:
with lib;
with lib.hlissner;
let
cfg = config.modules.services.proxy;
in
{
options.modules.services.proxy = {
enable = mkBoolOpt false;
listen-address = mkOpt types.str "localhost:8118";
forwards = {
ssh = mkBoolOpt true;
};
};
config = mkMerge [
(mkIf cfg.enable {
services = {
privoxy = {
enable = true;
settings = {
enable-edit-actions = true;
forward-socks5 = mkIf cfg.forwards.ssh "/ 127.0.0.1:49494 .";
listen-address = cfg.listen-address;
};
};
ssh-tunnel = mkIf cfg.forwards.ssh {
enable = true;
server = "infinidoge@server.doge-inc.net -p 245 -S none -i /home/infinidoge/.ssh/id_ed25519 -v";
# server = "infinidoge@71.90.199.237 -p 245 -S none -i /home/infinidoge/.ssh/id_ed25519 -v";
requiredBy = [ "privoxy.service" ];
forwards.dynamic = [ 49494 ];
};
};
networking.proxy.default = cfg.listen-address;
})
];
}

27
profiles/services/proxy.nix Normal file
View file

@ -0,0 +1,27 @@
{ ... }:
let
listen-address = "localhost:8118";
in
{
services = {
privoxy = {
enable = true;
settings = {
inherit listen-address;
enable-edit-actions = true;
forward-socks5 = "/ 127.0.0.1:49494 .";
};
};
ssh-tunnel = {
enable = true;
server = "infinidoge@server.doge-inc.net -p 245 -S none -i /home/infinidoge/.ssh/id_ed25519 -v";
# server = "infinidoge@71.90.199.237 -p 245 -S none -i /home/infinidoge/.ssh/id_ed25519 -v";
requiredBy = [ "privoxy.service" ];
forwards.dynamic = [ 49494 ];
};
};
networking.proxy.default = listen-address;
}