root/the_prg_server_configuration_old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the Part-DB pathing issues.

Browse source
This commit is contained in:
Root User 2026-02-07 18:46:43 +01:00
parent 9db947284f
commit e7722f83fd
Signed by: root
GPG key ID: 087F0A95E5766D72
4 changed files with 37 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

62
nix-system-configs/modules/songsheet/wavelog/docker-compose.nix
View file

@ -1,10 +1,8 @@
# Auto-generated by compose2nix.
{ pkgs, lib, config, ... }:
{
pkgs,
lib,
config,
...
}: {
# Runtime
virtualisation.podman = {
enable = true;
@ -14,12 +12,9 @@
# Enable container name DNS for all Podman networks.
networking.firewall.interfaces = let
matchAll =
if !config.networking.nftables.enable
then "podman+"
else "podman*";
matchAll = if !config.networking.nftables.enable then "podman+" else "podman*";
in {
"${matchAll}".allowedUDPPorts = [53];
"${matchAll}".allowedUDPPorts = [ 53 ];
};
virtualisation.oci-containers.backend = "podman";
@ -30,18 +25,15 @@
environment = {
"ALLOW_ATTACHMENT_DOWNLOADS" = "0";
"APP_ENV" = "docker";
"BASE_CURRENCY" = "EUR";
"DATABASE_URL" = "postgresql://:@:/?charset=utf8";
"BASE_CURRENCY" = "DKK";
"DEFAULT_LANG" = "en";
"DEFAULT_TIMEZONE" = "Europe/Berlin";
"DEFAULT_TIMEZONE" = "Europe/Copenhagen";
"INSTANCE_NAME" = "Part-DB";
"POSTGRES_DB" = "part_db_database";
"POSTGRES_HOST" = "10.1.1.251";
"POSTGRES_PORT" = "5432";
"USE_GRAVATAR" = "0";
"TRUSTED_PROXIES" = "10.1.1.250";
"USE_GRAVATAR" = "1";
};
environmentFiles = [
config.sops.secrets."songsheet/database".path
config.sops.secrets."songsheet/database/DATABASE_URL".path
];
volumes = [
"nix-system-configs/modules/songsheet/wavelog/db:/var/www/html/var/db:rw"
@ -52,7 +44,7 @@
"8087:80/tcp"
];
labels = {
"compose2nix.settings.sops.secrets" = "songsheet/database";
"compose2nix.settings.sops.secrets" = "songsheet/database/DATABASE_URL";
};
log-driver = "journald";
extraOptions = [
@ -161,7 +153,7 @@
# Networks
systemd.services."podman-network-wavelog_default" = {
path = [pkgs.podman];
path = [ pkgs.podman ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
@ -170,13 +162,13 @@
script = ''
podman network inspect wavelog_default || podman network create wavelog_default
'';
partOf = ["podman-compose-wavelog-root.target"];
wantedBy = ["podman-compose-wavelog-root.target"];
partOf = [ "podman-compose-wavelog-root.target" ];
wantedBy = [ "podman-compose-wavelog-root.target" ];
};
# Volumes
systemd.services."podman-volume-wavelog_wavelog-config" = {
path = [pkgs.podman];
path = [ pkgs.podman ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
@ -184,11 +176,11 @@
script = ''
podman volume inspect wavelog_wavelog-config || podman volume create wavelog_wavelog-config
'';
partOf = ["podman-compose-wavelog-root.target"];
wantedBy = ["podman-compose-wavelog-root.target"];
partOf = [ "podman-compose-wavelog-root.target" ];
wantedBy = [ "podman-compose-wavelog-root.target" ];
};
systemd.services."podman-volume-wavelog_wavelog-dbdata" = {
path = [pkgs.podman];
path = [ pkgs.podman ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
@ -196,11 +188,11 @@
script = ''
podman volume inspect wavelog_wavelog-dbdata || podman volume create wavelog_wavelog-dbdata
'';
partOf = ["podman-compose-wavelog-root.target"];
wantedBy = ["podman-compose-wavelog-root.target"];
partOf = [ "podman-compose-wavelog-root.target" ];
wantedBy = [ "podman-compose-wavelog-root.target" ];
};
systemd.services."podman-volume-wavelog_wavelog-uploads" = {
path = [pkgs.podman];
path = [ pkgs.podman ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
@ -208,11 +200,11 @@
script = ''
podman volume inspect wavelog_wavelog-uploads || podman volume create wavelog_wavelog-uploads
'';
partOf = ["podman-compose-wavelog-root.target"];
wantedBy = ["podman-compose-wavelog-root.target"];
partOf = [ "podman-compose-wavelog-root.target" ];
wantedBy = [ "podman-compose-wavelog-root.target" ];
};
systemd.services."podman-volume-wavelog_wavelog-userdata" = {
path = [pkgs.podman];
path = [ pkgs.podman ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
@ -220,8 +212,8 @@
script = ''
podman volume inspect wavelog_wavelog-userdata || podman volume create wavelog_wavelog-userdata
'';
partOf = ["podman-compose-wavelog-root.target"];
wantedBy = ["podman-compose-wavelog-root.target"];
partOf = [ "podman-compose-wavelog-root.target" ];
wantedBy = [ "podman-compose-wavelog-root.target" ];
};
# Root service
@ -231,6 +223,6 @@
unitConfig = {
Description = "Root target generated by compose2nix.";
};
wantedBy = ["multi-user.target"];
wantedBy = [ "multi-user.target" ];
};
}