fix(swan): update nextcloud and bazarr options, fix pyopenjtalk-plus and calibre builds

This commit is contained in:
Noah Masur committed 2026-10-25 00:28:11 +00:00
1 parent 542e39a2aa
commit b3d9938f10
6 files changed
+42 -7

No files matched your search

@@ -203,7 +203,7 @@ in
upstreams = [
{
# Bazarr only dynamically sets the port, not the host
dial = "localhost:${builtins.toString config.services.bazarr.listenPort}";
dial = "localhost:${builtins.toString config.services.bazarr.settings.general.port}";
}
];
}
@@ -837,7 +837,7 @@ in
{
matcher = {
id = "byName";
options = "localhost:${builtins.toString config.services.bazarr.listenPort}";
options = "localhost:${builtins.toString config.services.bazarr.settings.general.port}";
};
properties = [
{
@@ -25,7 +25,6 @@ in
hostName = "localhost";
maxUploadSize = "50G";
config = {
adminpassFile = config.secrets.nextcloud.dest;
dbtype = "pgsql"; # Enables postgresql
};
settings = {
@@ -209,8 +208,14 @@ in
permissions = "0440";
};
systemd.services.nextcloud-secret = {
requiredBy = [ "nextcloud-setup.service" ];
before = [ "nextcloud-setup.service" ];
requiredBy = [
"nextcloud-setup.service"
"prometheus-nextcloud-exporter.service"
];
before = [
"nextcloud-setup.service"
"prometheus-nextcloud-exporter.service"
];
};
secrets.nextcloud-oidc-secret = {
@@ -249,9 +254,9 @@ in
networking.hosts."127.0.0.1" = [ hostnames.content ];
services.prometheus.exporters.nextcloud = {
enable = true;
username = config.services.nextcloud.config.adminuser;
username = "root";
url = "https://${hostnames.content}";
passwordFile = config.services.nextcloud.config.adminpassFile;
passwordFile = config.secrets.nextcloud.dest;
};
nmasur.presets.services.prometheus-exporters.scrapeTargets = [
"127.0.0.1:${builtins.toString config.services.prometheus.exporters.nextcloud.port}"