1
0
Fork 0

Services: use Unix sockets instead of HTTP ports (attempt 1)

This commit is contained in:
Aires 2024-10-05 15:33:33 -04:00
parent 97df6d213d
commit 8dd7fcd81a
3 changed files with 51 additions and 49 deletions

View file

@ -6,20 +6,8 @@
}: }:
let let
cfg = config.aux.system.services.forgejo; cfg = config.aux.system.services.forgejo;
cli-cfg = config.services.forgejo;
forgejo-cli = pkgs.writeScriptBin "forgejo-cli" '' socket = "/run/services/forgejo/web.socket";
#!${pkgs.runtimeShell}
cd ${cli-cfg.stateDir}
sudo=exec
if [[ "$USER" != forgejo ]]; then
sudo='exec /run/wrappers/bin/sudo -u ${cli-cfg.user} -g ${cli-cfg.group} --preserve-env=GITEA_WORK_DIR --preserve-env=GITEA_CUSTOM'
fi
# Note that these variable names will change
export GITEA_WORK_DIR=${cli-cfg.stateDir}
export GITEA_CUSTOM=${cli-cfg.customDir}
$sudo ${lib.getExe cli-cfg.package} "$@"
'';
in in
{ {
options = { options = {
@ -49,10 +37,7 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ environment.systemPackages = [ pkgs.podman-tui ];
forgejo-cli
pkgs.podman-tui
];
services = { services = {
forgejo = { forgejo = {
enable = true; enable = true;
@ -60,7 +45,8 @@ in
server = { server = {
DOMAIN = pkgs.util.getDomainFromURL cfg.url; DOMAIN = pkgs.util.getDomainFromURL cfg.url;
ROOT_URL = cfg.url; ROOT_URL = cfg.url;
HTTP_PORT = 3000; PROTOCOL = "http+unix";
HTTP_ADDR = socket;
}; };
indexer.REPO_INDEXER_ENABLED = true; # Enable code indexing indexer.REPO_INDEXER_ENABLED = true; # Enable code indexing
}; };
@ -71,7 +57,7 @@ in
useACMEHost = pkgs.util.getDomainFromURL cfg.url; useACMEHost = pkgs.util.getDomainFromURL cfg.url;
forceSSL = true; forceSSL = true;
locations."/" = { locations."/" = {
proxyPass = "http://127.0.0.1:3000"; proxyPass = "http://unix:${socket}:";
proxyWebsockets = true; proxyWebsockets = true;
extraConfig = "proxy_ssl_server_name on;"; # required when the target is also TLS server with multiple hosts extraConfig = "proxy_ssl_server_name on;"; # required when the target is also TLS server with multiple hosts
}; };

View file

@ -7,6 +7,8 @@
let let
cfg = config.aux.system.services.jellyfin; cfg = config.aux.system.services.jellyfin;
socket = "/run/services/jellyfin/web.socket";
jellyfin-audio-save = pkgs.jellyfin.overrideAttrs ( jellyfin-audio-save = pkgs.jellyfin.overrideAttrs (
finalAttrs: prevAttrs: { patches = [ ./jellyfin/jellyfin-audio-save-position.patch ]; } finalAttrs: prevAttrs: { patches = [ ./jellyfin/jellyfin-audio-save-position.patch ]; }
); );
@ -33,11 +35,18 @@ in
aux.system.users.media.enable = true; aux.system.users.media.enable = true;
services = { services = {
jellyfin = {
enable = true;
dataDir = cfg.home;
group = "media";
package = jellyfin-audio-save;
};
nginx.virtualHosts."${cfg.url}" = { nginx.virtualHosts."${cfg.url}" = {
useACMEHost = pkgs.util.getDomainFromURL cfg.url; useACMEHost = pkgs.util.getDomainFromURL cfg.url;
forceSSL = true; forceSSL = true;
locations."/" = { locations."/" = {
proxyPass = "http://127.0.0.1:8096"; proxyPass = "http://unix:${socket}:";
proxyWebsockets = true; proxyWebsockets = true;
extraConfig = '' extraConfig = ''
# Taken from https://jellyfin.org/docs/general/networking/nginx/ # Taken from https://jellyfin.org/docs/general/networking/nginx/
@ -60,7 +69,7 @@ in
''; '';
}; };
locations."/socket" = { locations."/socket" = {
proxyPass = "http://127.0.0.1:8096"; proxyPass = "http://unix:${socket}:";
proxyWebsockets = true; proxyWebsockets = true;
extraConfig = '' extraConfig = ''
# Proxy Jellyfin Websockets traffic # Proxy Jellyfin Websockets traffic
@ -75,13 +84,6 @@ in
''; '';
}; };
}; };
jellyfin = {
enable = true;
dataDir = cfg.home;
group = "media";
package = jellyfin-audio-save;
};
}; };
# Install packages for plugins # Install packages for plugins
@ -91,7 +93,15 @@ in
]; ];
systemd.services = { systemd.services = {
jellyfin.unitConfig.RequiresMountsFor = cfg.home; jellyfin = {
# Use Unix sockets in place of ports
environment = {
JELLYFIN_kestrel__socketPermissions = "0777";
JELLYFIN_kestrel__socketPath = socket;
JELLYFIN_kestrel__socket = "true";
};
unitConfig.RequiresMountsFor = cfg.home;
};
nginx.wants = [ config.systemd.services.jellyfin.name ]; nginx.wants = [ config.systemd.services.jellyfin.name ];
}; };
}; };

View file

@ -6,6 +6,8 @@
}: }:
let let
cfg = config.aux.system.services.netdata; cfg = config.aux.system.services.netdata;
socket = "/run/services/netdata/web.socket";
in in
{ {
options = { options = {
@ -49,26 +51,6 @@ in
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf (cfg.enable && cfg.type == "parent") { (lib.mkIf (cfg.enable && cfg.type == "parent") {
services = { services = {
nginx.virtualHosts."${cfg.url}" = {
useACMEHost = pkgs.util.getDomainFromURL cfg.url;
forceSSL = true;
basicAuth = {
"${cfg.auth.user}" = cfg.auth.password;
};
locations."/" = {
proxyPass = "http://127.0.0.1:19999";
extraConfig = ''
# Taken from https://learn.netdata.cloud/docs/netdata-agent/configuration/running-the-netdata-agent-behind-a-reverse-proxy/nginx
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass_request_headers on;
proxy_set_header Connection "keep-alive";
proxy_store off;
'';
};
};
netdata = { netdata = {
enable = true; enable = true;
package = pkgs.unstable.netdataCloud; package = pkgs.unstable.netdataCloud;
@ -87,6 +69,30 @@ in
health enabled by default = auto health enabled by default = auto
allow streaming from = * allow streaming from = *
''; '';
"socket.conf" = pkgs.writeText "socket.conf" ''
[web]
bind to = unix:${socket}
'';
};
};
nginx.virtualHosts."${cfg.url}" = {
useACMEHost = pkgs.util.getDomainFromURL cfg.url;
forceSSL = true;
basicAuth = {
"${cfg.auth.user}" = cfg.auth.password;
};
locations."/" = {
proxyPass = "http://unix:${socket}:";
extraConfig = ''
# Taken from https://learn.netdata.cloud/docs/netdata-agent/configuration/running-the-netdata-agent-behind-a-reverse-proxy/nginx
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass_request_headers on;
proxy_set_header Connection "keep-alive";
proxy_store off;
'';
}; };
}; };
}; };