numbus/numbus-server-module
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes.

Browse Source
This commit is contained in:
Raphaël Numbus
2026-02-25 21:39:07 +01:00
parent 70acd769d6
commit 9b0c350219
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/services/lib.nix
+2 -2
View File
@@ -77,7 +77,7 @@ with lib;
{ {
environment.etc."podman/${name}/compose.yaml".text = composeText; environment.etc."podman/${name}/compose.yaml".text = composeText;
environment.etc."${config.numbus.traefikDynamicConfigDir}/${name}.yaml" = mkIf cfg.reverseProxied { environment.etc."${config.numbus.service.traefikDynamicConfigDir}/${name}.yaml" = mkIf cfg.reverseProxied {
text = '' text = ''
http: http:
routers: routers:
@@ -107,7 +107,7 @@ ${concatStringsSep "\n" (map (m: " - ${m}") middlewares)}
onFailure = [ "service-failure-notify@%n.service" ]; onFailure = [ "service-failure-notify@%n.service" ];
startLimitBurst = 5; startLimitBurst = 5;
startLimitIntervalSec = 600; startLimitIntervalSec = 600;
path = [ pkgs.podman pkgs.podman-compose pkgs.coreutils pkgs.sudo ]; path = [ pkgs.bash pkgs.podman pkgs.podman-compose pkgs.coreutils pkgs.sudo ];
serviceConfig = { serviceConfig = {
Type = "exec"; Type = "exec";
ExecStartPre = [ ExecStartPre = [
modules/services/nextcloud.nix
+2 -2
View File
@@ -157,7 +157,7 @@ helper.mkPodmanService {
''; '';
extraConfig = { extraConfig = {
environment.etc."${config.numbus.traefikDynamicConfigDir}/nextcloud-onlyoffice.yaml".text = '' environment.etc."${config.numbus.service.traefikDynamicConfigDir}/nextcloud-onlyoffice.yaml".text = ''
http: http:
routers: routers:
nextcloud-onlyoffice: nextcloud-onlyoffice:
@@ -177,7 +177,7 @@ helper.mkPodmanService {
- url: "http://host.containers.internal:9980" - url: "http://host.containers.internal:9980"
''; '';
environment.etc."${config.numbus.traefikDynamicConfigDir}/nextcloud-whiteboard.yaml".text = '' environment.etc."${config.numbus.service.traefikDynamicConfigDir}/nextcloud-whiteboard.yaml".text = ''
http: http:
routers: routers:
nextcloud-whiteboard: nextcloud-whiteboard:
modules/services/traefik.nix
+9 -9
View File
@@ -24,8 +24,8 @@ helper.mkPodmanService {
}; };
dirPermissions = [ dirPermissions = [
"100999:users ${cfg.configDir}" "100999:users ${cfg.configDir}"
"100999:users /etc/${cfg.staticConfigFile}" "100999:users ${cfg.staticConfigDir}"
"100999:users ${config.numbus.traefikDynamicConfigDir}" "100999:users ${config.numbus.service.traefikDynamicConfigDir}"
]; ];
# Compose file good # Compose file good
@@ -41,8 +41,8 @@ helper.mkPodmanService {
- "80:80/tcp" - "80:80/tcp"
- "443:443/tcp" - "443:443/tcp"
volumes: volumes:
- /etc/${cfg.staticConfigFile}:/etc/traefik/traefik.yaml:ro - ${cfg.staticConfigDir}/config.yaml:/etc/traefik/traefik.yaml:ro
- ${config.numbus.traefikDynamicConfigDir}:/etc/traefik/conf:ro - ${config.numbus.service.traefikDynamicConfigDir}:/etc/traefik/conf:ro
- ${cfg.configDir}:/var/traefik/certs:rw - ${cfg.configDir}:/var/traefik/certs:rw
environment: environment:
- CF_DNS_API_TOKEN=$CLOUDFLARE_DNS_API_TOKEN - CF_DNS_API_TOKEN=$CLOUDFLARE_DNS_API_TOKEN
@@ -99,7 +99,7 @@ helper.mkPodmanService {
watch: true watch: true
''; '';
environment.etc."${config.numbus.traefikDynamicConfigDir}/secureHeaders.yaml".text = '' environment.etc."${config.numbus.service.traefikDynamicConfigDir}/secureHeaders.yaml".text = ''
http: http:
middlewares: middlewares:
secureHeaders: secureHeaders:
@@ -122,7 +122,7 @@ helper.mkPodmanService {
STSSeconds: 315360000 STSSeconds: 315360000
''; '';
environment.etc."${config.numbus.traefikDynamicConfigDir}/secureTLS.yaml".text = '' environment.etc."${config.numbus.service.traefikDynamicConfigDir}/secureTLS.yaml".text = ''
tls: tls:
options: options:
secureTLS: secureTLS:
@@ -140,10 +140,10 @@ helper.mkPodmanService {
extraOptions = { extraOptions = {
enable.default = true; enable.default = true;
staticConfigFile = mkOption { staticConfigFileDir = mkOption {
type = types.str; type = types.str;
default = "traefik/config.yaml"; default = "/etc/traefik";
description = "The path for Traefik's static configuration file, relative to /etc/"; description = "The path of the directory containing Traefik's static configuration file";
}; };
logLevel = mkOption { logLevel = mkOption {
type = types.enum [ "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "FATAL" ]; type = types.enum [ "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "FATAL" ];