Compare commits

...

8 commits

Author SHA1 Message Date
99cdb697f1 WIP: WAITING FOR NIXPKS UPDATE
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2023-12-25 20:21:00 +01:00
8c932d159e hosts: nixos: porthos: services: enable pyload 2023-12-25 20:20:59 +01:00
cd96ffe5ee hosts: nixos: porthos: secrets: add pyload creds 2023-12-25 20:20:59 +01:00
e42d611eba nixos: services: add pyload 2023-12-25 20:20:59 +01:00
a3c2135c26 nixos: services: nginx: fix SSO subdomain 2023-12-25 20:20:50 +01:00
c2867b3483 nixos: services: remove redundant subdomains
See previous commit for the defaults.
2023-12-25 20:20:50 +01:00
5572b7b049 nixos: services: nginx: add default subdomain
In almost all cases, the subdomain should be the same as the attribute
name...
2023-12-25 20:20:50 +01:00
5d612efb6c nixos: services: nginx: use attrset for vhosts
Attribute sets compose better than lists, it was a mistake to use a list
in the first place...
2023-12-25 20:20:50 +01:00
32 changed files with 442 additions and 151 deletions

View file

@ -0,0 +1,7 @@
age-encryption.org/v1
-> ssh-ed25519 cKojmg nJbOfp0/wmFOZLzcWjoGB7wEB8e56aO1NntSmn5KomU
/Vio4Z/t7IPJrdzdwUPidVH3wrouSkwRzNHP0T4z3x0
-> ssh-ed25519 jPowng QXg/xqs7/VfkYQg3X77w4i53q64bL9oYeTxqb9NVhiQ
sMHIXlmrIxtIr+s0X4lBqev/PPd3AKD5P7AP5K4NeJg
--- gzTn+6+aa4Ptic1lsvSt+r3IEBysHrvMMIyONogMDF0
<EFBFBD>ÏÂ<EFBFBD>Ë®UE_í</¯çQ·Ü+U“AГMÄÿ/kï×dAL/”úÕįÍoæ\XïEDÇÑfã\ièĽàpF„`#¬nx1î<31>ûÞèDëàÂË5CéЦ&fòB»q${Gg…Aqˆ³@üVu!Cc…R\ªÖ¨

View file

@ -62,6 +62,8 @@ in
"podgrab/password.age".publicKeys = all;
"pyload/credentials.age".publicKeys = all;
"sso/auth-key.age".publicKeys = all;
"sso/ambroisie/password-hash.age".publicKeys = all;
"sso/ambroisie/totp-secret.age".publicKeys = all;

View file

@ -134,6 +134,10 @@ in
};
# Regular backups
postgresql-backup.enable = true;
pyload = {
enable = true;
credentialsFile = secrets."pyload/credentials".path;
};
# RSS provider for websites that do not provide any feeds
rss-bridge.enable = true;
# Usenet client

View file

@ -5,11 +5,10 @@ let
domain = config.networking.domain;
makeHostInfo = subdomain: {
inherit subdomain;
root = "/var/www/${subdomain}";
};
hostsInfo = map makeHostInfo [ "cv" "dev" "key" ];
hostsInfo = lib.flip lib.genAttrs makeHostInfo [ "cv" "dev" "key" ];
in
{
options.my.services.blog = {

View file

@ -40,12 +40,11 @@ in
# Set-up media group
users.groups.media = { };
my.services.nginx.virtualHosts = [
{
subdomain = "library";
my.services.nginx.virtualHosts = {
library = {
inherit (cfg) port;
}
];
};
};
my.services.backup = {
paths = [

View file

@ -26,6 +26,7 @@
./podgrab
./postgresql
./postgresql-backup
./pyload
./quassel
./rss-bridge
./sabnzbd

View file

@ -45,11 +45,10 @@ in
}];
};
my.services.nginx.virtualHosts = [
{
subdomain = "drone";
my.services.nginx.virtualHosts = {
drone = {
inherit (cfg) port;
}
];
};
};
};
}

View file

@ -40,11 +40,10 @@ in
};
};
my.services.nginx.virtualHosts = [
{
subdomain = "flood";
my.services.nginx.virtualHosts = {
flood = {
inherit (cfg) port;
}
];
};
};
};
}

View file

@ -116,18 +116,16 @@ in
};
users.groups.git = { };
my.services.nginx.virtualHosts = [
my.services.nginx.virtualHosts = {
# Proxy to Gitea
{
subdomain = "git";
git = {
inherit (cfg) port;
}
};
# Redirect `gitea.` to actual forge subdomain
{
subdomain = "gitea";
gitea = {
redirect = config.services.gitea.settings.server.ROOT_URL;
}
];
};
};
my.services.backup = {
paths = [

View file

@ -28,12 +28,11 @@ in
};
};
my.services.nginx.virtualHosts = [
{
subdomain = "jackett";
my.services.nginx.virtualHosts = {
jackett = {
port = jackettPort;
}
];
};
};
})
(lib.mkIf cfg.nzbhydra.enable {
@ -41,12 +40,11 @@ in
enable = true;
};
my.services.nginx.virtualHosts = [
{
subdomain = "nzbhydra";
my.services.nginx.virtualHosts = {
nzbhydra = {
port = nzbhydraPort;
}
];
};
};
})
(lib.mkIf cfg.prowlarr.enable {
@ -54,12 +52,11 @@ in
enable = true;
};
my.services.nginx.virtualHosts = [
{
subdomain = "prowlarr";
my.services.nginx.virtualHosts = {
prowlarr = {
port = prowlarrPort;
}
];
};
};
services.fail2ban.jails = {
prowlarr = ''

View file

@ -17,9 +17,8 @@ in
# Set-up media group
users.groups.media = { };
my.services.nginx.virtualHosts = [
{
subdomain = "jellyfin";
my.services.nginx.virtualHosts = {
jellyfin = {
port = 8096;
extraConfig = {
locations."/" = {
@ -33,7 +32,7 @@ in
proxyWebsockets = true;
};
};
}
];
};
};
};
}

View file

@ -98,11 +98,10 @@ in
};
users.groups.lohr = { };
my.services.nginx.virtualHosts = [
{
subdomain = "lohr";
my.services.nginx.virtualHosts = {
lohr = {
inherit (cfg) port;
}
];
};
};
};
}

View file

@ -117,10 +117,9 @@ in
};
};
my.services.nginx.virtualHosts = [
my.services.nginx.virtualHosts = {
# Element Web app deployment
{
subdomain = "chat";
chat = {
root = pkgs.element-web.override {
conf = {
default_server_config = {
@ -145,22 +144,19 @@ in
};
};
};
}
};
# Dummy VHosts for port collision detection
{
subdomain = "matrix-federation";
matrix-federation = {
port = federationPort.private;
}
{
subdomain = "matrix-client";
};
matrix-client = {
port = clientPort.private;
}
};
# Sliding sync
{
subdomain = "matrix-sync";
matrix-sync = {
inherit (cfg.slidingSync) port;
}
];
};
};
# Those are too complicated to use my wrapper...
services.nginx.virtualHosts = {

View file

@ -43,11 +43,10 @@ in
};
};
my.services.nginx.virtualHosts = [
{
subdomain = "reader";
my.services.nginx.virtualHosts = {
reader = {
inherit (cfg) port;
}
];
};
};
};
}

View file

@ -125,11 +125,10 @@ in
];
};
my.services.nginx.virtualHosts = [
{
subdomain = "monitoring";
my.services.nginx.virtualHosts = {
monitoring = {
inherit (cfg.grafana) port;
}
];
};
};
};
}

View file

@ -47,11 +47,10 @@ in
};
};
my.services.nginx.virtualHosts = [
{
subdomain = "music";
my.services.nginx.virtualHosts = {
music = {
inherit (cfg) port;
}
];
};
};
};
}

View file

@ -5,10 +5,11 @@ let
domain = config.networking.domain;
virtualHostOption = with lib; types.submodule {
virtualHostOption = with lib; types.submodule ({ name, ... }: {
options = {
subdomain = mkOption {
type = types.str;
default = name;
example = "dev";
description = ''
Which subdomain, under config.networking.domain, to use
@ -72,7 +73,7 @@ let
'';
};
};
};
});
in
{
imports = [
@ -97,20 +98,18 @@ in
};
virtualHosts = mkOption {
type = types.listOf virtualHostOption;
default = [ ];
type = types.attrsOf virtualHostOption;
default = { };
example = litteralExample ''
[
{
subdomain = "gitea";
{
gitea = {
subdomain = "git";
port = 8080;
}
{
subdomain = "dev";
};
dev = {
root = "/var/www/dev";
}
{
subdomain = "jellyfin";
};
jellyfin = {
port = 8096;
extraConfig = {
locations."/socket" = {
@ -118,8 +117,8 @@ in
proxyWebsockets = true;
};
};
}
]
};
}
'';
description = ''
List of virtual hosts to set-up using default settings.
@ -190,7 +189,7 @@ in
config = lib.mkIf cfg.enable {
assertions = [ ]
++ (lib.flip builtins.map cfg.virtualHosts ({ subdomain, ... } @ args:
++ (lib.flip lib.mapAttrsToList cfg.virtualHosts (_: { subdomain, ... } @ args:
let
conflicts = [ "port" "root" "socket" "redirect" ];
optionsNotNull = builtins.map (v: args.${v} != null) conflicts;
@ -209,7 +208,7 @@ in
ports = lib.my.mapFilter
(v: v != null)
({ port, ... }: port)
cfg.virtualHosts;
(lib.attrValues cfg.virtualHosts);
portCounts = lib.my.countValues ports;
nonUniquesCounts = lib.filterAttrs (_: v: v != 1) portCounts;
nonUniques = builtins.attrNames nonUniquesCounts;
@ -221,7 +220,7 @@ in
map mkAssertion nonUniques
) ++ (
let
subs = map ({ subdomain, ... }: subdomain) cfg.virtualHosts;
subs = lib.mapAttrsToList (_: { subdomain, ... }: subdomain) cfg.virtualHosts;
subsCounts = lib.my.countValues subs;
nonUniquesCounts = lib.filterAttrs (_: v: v != 1) subsCounts;
nonUniques = builtins.attrNames nonUniquesCounts;
@ -325,7 +324,7 @@ in
])
);
in
lib.my.genAttrs' cfg.virtualHosts mkVHost;
lib.my.genAttrs' (lib.attrValues cfg.virtualHosts) mkVHost;
sso = {
enable = true;
@ -403,12 +402,11 @@ in
};
};
my.services.nginx.virtualHosts = [
{
subdomain = "login";
my.services.nginx.virtualHosts = {
${cfg.sso.subdomain} = {
inherit (cfg.sso) port;
}
];
};
};
networking.firewall.allowedTCPPorts = [ 80 443 ];

View file

@ -43,11 +43,10 @@ in
signKeyPath = cfg.secretKeyFile;
};
my.services.nginx.virtualHosts = [
{
subdomain = "cache";
my.services.nginx.virtualHosts = {
cache = {
inherit (cfg) port;
}
];
};
};
};
}

View file

@ -143,9 +143,8 @@ in
extraGroups = [ "media" ];
};
my.services.nginx.virtualHosts = [
{
subdomain = "paperless";
my.services.nginx.virtualHosts = {
paperless = {
inherit (cfg) port;
sso = {
enable = true;
@ -155,8 +154,8 @@ in
extraConfig = {
locations."/".proxyWebsockets = true;
};
}
];
};
};
my.services.backup = {
paths = [

View file

@ -21,12 +21,11 @@ let
};
mkRedirection = service: {
my.services.nginx.virtualHosts = [
{
subdomain = service;
my.services.nginx.virtualHosts = {
${service} = {
port = ports.${service};
}
];
};
};
};
mkFail2Ban = service: lib.mkIf cfg.${service}.enable {

View file

@ -31,11 +31,10 @@ in
inherit (cfg) passwordFile port;
};
my.services.nginx.virtualHosts = [
{
subdomain = "podgrab";
my.services.nginx.virtualHosts = {
podgrab = {
inherit (cfg) port;
}
];
};
};
};
}

View file

@ -0,0 +1,66 @@
{ config, lib, ... }:
let
cfg = config.my.services.pyload;
in
{
imports = [
./nixos.nix
];
options.my.services.pyload = with lib; {
enable = mkEnableOption "pyload download manager";
credentialsFile = mkOption {
type = types.path;
example = "/run/secrets/pyload-credentials.env";
description = "pyload credentials";
};
downloadDirectory = mkOption {
type = types.str;
default = "/data/downloads";
example = "/var/lib/pyload/download";
description = "Download directory";
};
port = mkOption {
type = types.port;
default = 9093;
example = 8080;
description = "Internal port for webui";
};
};
config = lib.mkIf cfg.enable {
services.pyload = {
enable = true;
# Listening on `localhost` leads to 502 with the reverse proxy...
listenAddress = "127.0.0.1";
inherit (cfg)
credentialsFile
downloadDirectory
port
;
};
# User media group when downloading files
systemd. services. pyload = {
serviceConfig = {
Group = lib.mkForce "media";
};
};
# Set-up media group
users.groups.media = { };
my.services.nginx.virtualHosts = {
pyload = {
inherit (cfg) port;
};
};
# FIXME: fail2ban
};
}

View file

@ -0,0 +1,144 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.pyload;
stateDir = "/var/lib/pyload";
userDir = "${stateDir}/config";
in
{
options = with lib; {
services.pyload = {
enable = mkEnableOption "pyload download manager";
package = mkPackageOption pkgs "pyload-ng" { };
listenAddress = mkOption {
type = types.str;
default = "localhost";
example = "0.0.0.0";
description = "Address to listen on for the web UI.";
};
port = mkOption {
type = types.port;
default = 8000;
example = 9876;
description = "Port to listen on for the web UI.";
};
downloadDirectory = mkOption {
type = types.path;
default = "${stateDir}/downloads";
example = "/mnt/downloads";
description = "Directory to store downloads";
};
credentialsFile = mkOption {
type = with types; nullOr path;
default = null;
example = "/run/secrets/pyload-credentials.env";
description = ''
File containing PYLOAD_DEFAULT_USERNAME and PYLOAD_DEFAULT_PASSWORD
in the format of an EnvironmentFile=, as described by systemd.exec(5).
If not given, they default to the username/password combo of
pyload/pyload.
'';
};
};
};
config = lib.mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d ${cfg.downloadDirectory}"
];
systemd.services.pyload = {
description = "pyload service";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
# NOTE: unlike what the documentation says, it looks like `HOME` is not
# defined with this service definition...
# Since pyload tries to do the equivalent of `cd ~`, it needs to be able
# to resolve $HOME, which fails when `RootDirectory` is set.
# FIXME: check if `SetLoginEnvironment` fixes this issue in version 255
environment = {
HOME = stateDir;
PYLOAD__WEBUI__HOST = cfg.listenAddress;
PYLOAD__WEBUI__PORT = builtins.toString cfg.port;
};
serviceConfig = {
# FIXME: use getExe
ExecStart = "${lib.getExe' cfg.package "pyload"} ${lib.escapeShellArgs [
"--userdir" userDir
"--storagedir" cfg.downloadDirectory
]}";
User = "pyload";
Group = "pyload";
DynamicUser = true;
EnvironmentFile = lib.optional (cfg.credentialsFile != null) cfg.credentialsFile;
StateDirectory = "pyload";
WorkingDirectory = stateDir;
RuntimeDirectory = "pyload";
RuntimeDirectoryMode = "0700";
RootDirectory = "/run/pyload";
BindReadOnlyPaths = [
builtins.storeDir # Needed to run the python interpreter
];
BindPaths = [
cfg.downloadDirectory
];
# Hardening options
LockPersonality = true;
MemoryDenyWriteExecute = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateMounts = true;
PrivateTmp = true;
PrivateUsers = true;
ProcSubset = "pid";
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProtectSystem = "strict";
RemoveIPC = true;
RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX";
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallFilter = [ "@system-service" "~@resources" "~@privileged" ];
UMask = "0002";
CapabilityBoundingSet = [
"~CAP_BLOCK_SUSPEND"
"~CAP_BPF"
"~CAP_CHOWN"
"~CAP_IPC_LOCK"
"~CAP_KILL"
"~CAP_LEASE"
"~CAP_LINUX_IMMUTABLE"
"~CAP_NET_ADMIN"
"~CAP_SYS_ADMIN"
"~CAP_SYS_BOOT"
"~CAP_SYS_CHROOT"
"~CAP_SYS_NICE"
"~CAP_SYS_PACCT"
"~CAP_SYS_PTRACE"
"~CAP_SYS_RESOURCE"
"~CAP_SYS_TTY_CONFIG"
];
};
};
};
}

View file

@ -18,12 +18,11 @@ in
# Set-up media group
users.groups.media = { };
my.services.nginx.virtualHosts = [
{
subdomain = "sabnzbd";
my.services.nginx.virtualHosts = {
sabnzbd = {
inherit port;
}
];
};
};
services.fail2ban.jails = {
sabnzbd = ''

View file

@ -70,11 +70,10 @@ in
];
};
my.services.nginx.virtualHosts = [
{
subdomain = "recipes";
my.services.nginx.virtualHosts = {
recipes = {
inherit (cfg) port;
}
];
};
};
};
}

View file

@ -80,12 +80,11 @@ in
# Default transmission webui, I prefer combustion but its development
# seems to have stalled
my.services.nginx.virtualHosts = [
{
subdomain = "transmission";
my.services.nginx.virtualHosts = {
transmission = {
inherit (cfg) port;
}
];
};
};
networking.firewall = {
allowedTCPPorts = [ cfg.peerPort ];

View file

@ -59,9 +59,8 @@ in
};
# This is a weird setup
my.services.nginx.virtualHosts = [
{
inherit subdomain;
my.services.nginx.virtualHosts = {
${subdomain} = {
# Serve the root for the web-ui
root = config.services.vikunja.package-frontend;
@ -80,8 +79,8 @@ in
};
};
};
}
];
};
};
systemd.services.vikunja-api = {
serviceConfig = {

View file

@ -52,16 +52,14 @@ in
}];
};
my.services.nginx.virtualHosts = [
{
subdomain = "woodpecker";
my.services.nginx.virtualHosts = {
woodpecker = {
inherit (cfg) port;
}
};
# I might want to be able to RPC from other hosts in the future
{
subdomain = "woodpecker-rpc";
woodpecker-rpc = {
port = cfg.rpcPort;
}
];
};
};
};
}

View file

@ -0,0 +1,18 @@
diff --git a/src/pyload/core/__init__.py b/src/pyload/core/__init__.py
index 4324fc700..5d915a85e 100644
--- a/src/pyload/core/__init__.py
+++ b/src/pyload/core/__init__.py
@@ -128,6 +128,13 @@ class Core:
else:
self._debug = max(0, int(debug))
+ # Allow setting any option declaratively, for the NixOS module
+ for env, value in os.environ.items():
+ if not env.startswith("PYLOAD__"):
+ continue
+ section, opt = env.removeprefix("PYLOAD__").lower().split("__")
+ self.config.set(section, opt, value)
+
# If no argument set, read storage dir from config file,
# otherwise save setting to config dir
if storagedir is None:

View file

@ -0,0 +1,15 @@
diff --git a/src/pyload/core/__init__.py b/src/pyload/core/__init__.py
index 4324fc700..f7fcd66ec 100644
--- a/src/pyload/core/__init__.py
+++ b/src/pyload/core/__init__.py
@@ -46,8 +46,8 @@ class Exit(Exception):
# improve external scripts
class Core:
LOCALE_DOMAIN = APPID
- DEFAULT_USERNAME = APPID
- DEFAULT_PASSWORD = APPID
+ DEFAULT_USERNAME = os.getenv("PYLOAD_DEFAULT_USERNAME", APPID)
+ DEFAULT_PASSWORD = os.getenv("PYLOAD_DEFAULT_PASSWORD", APPID)
DEFAULT_DATADIR = os.path.join(
os.getenv("APPDATA") or USERHOMEDIR, "pyLoad" if os.name == "nt" else ".pyload"
)

View file

@ -0,0 +1,4 @@
self: _super:
{
pyload-ng = self.callPackage ./package.nix { };
}

View file

@ -0,0 +1,60 @@
{ lib, fetchPypi, python3 }:
python3.pkgs.buildPythonApplication rec {
version = "0.5.0b3.dev75";
pname = "pyload-ng";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-1lPIKkZESonDaVCnac0iUu/gCqXVDBhNZrk5S0eC6F0=";
};
patches = [
# Makes it possible to change the default username/password in the module
./declarative-default-user.patch
./declarative-config.patch
];
postPatch = ''
# relax version bounds
sed -i 's/\([A-z0-9]*\)~=.*$/\1/' setup.cfg
# not sure what Flask-Session2 is but flask-session works just fine
sed -i '/Flask-Session2/d' setup.cfg
'';
propagatedBuildInputs = with python3.pkgs; [
bitmath
certifi
cheroot
cryptography
filetype
flask
flask-babel
flask-caching
flask-compress
flask-session
flask-themes2
js2py
pycurl
semver
setuptools
];
passthru.optional-dependencies = {
plugins = with python3.pkgs; [
beautifulsoup4 # for some plugins
colorlog # colorful console logging
pillow # for some CAPTCHA plugin
send2trash # send some files to trash instead of deleting them
slixmpp # XMPP plugin
];
};
meta = with lib; {
description = "Free and open-source download manager with support for 1-click-hosting sites";
homepage = "https://github.com/pyload/pyload";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ ruby0b ];
};
}