diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix b/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix index 76a090d..e7c1da3 100644 --- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix +++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.nix @@ -1,8 +1,10 @@ # Auto-generated by compose2nix. - -{ pkgs, lib, config, ... }: - { + pkgs, + lib, + config, + ... +}: { # Runtime virtualisation.podman = { enable = true; @@ -12,9 +14,12 @@ # 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"; @@ -26,6 +31,7 @@ "ALLOW_ATTACHMENT_DOWNLOADS" = "0"; "APP_ENV" = "docker"; "BASE_CURRENCY" = "DKK"; + "CHECK_FOR_UPDATES" = "false"; "DB_AUTOMIGRATE" = "true"; "DEFAULT_LANG" = "en"; "DEFAULT_TIMEZONE" = "Europe/Copenhagen"; @@ -140,7 +146,7 @@ "2022:2022/tcp" "8443:443/tcp" ]; - cmd = [ "wings" "--ignore-certificate-errors" ]; + cmd = ["wings" "--ignore-certificate-errors"]; log-driver = "journald"; extraOptions = [ "--network-alias=wings" @@ -248,7 +254,7 @@ # Networks systemd.services."podman-network-pelican" = { - path = [ pkgs.podman ]; + path = [pkgs.podman]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -257,11 +263,11 @@ script = '' podman network inspect pelican || podman network create pelican ''; - 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-network-wavelog_default" = { - path = [ pkgs.podman ]; + path = [pkgs.podman]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -270,11 +276,11 @@ 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"]; }; systemd.services."podman-network-wings1" = { - path = [ pkgs.podman ]; + path = [pkgs.podman]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -283,13 +289,13 @@ script = '' podman network inspect wings1 || podman network create wings1 --driver=bridge --opt=com.docker.network.bridge.name=wings1 --subnet=172.92.0.0/16 ''; - 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_partdb_db_f" = { - path = [ pkgs.podman ]; + path = [pkgs.podman]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -297,11 +303,11 @@ script = '' podman volume inspect wavelog_partdb_db_f || podman volume create wavelog_partdb_db_f ''; - 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_partdb_media_f" = { - path = [ pkgs.podman ]; + path = [pkgs.podman]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -309,11 +315,11 @@ script = '' podman volume inspect wavelog_partdb_media_f || podman volume create wavelog_partdb_media_f ''; - 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_partdb_uploads_f" = { - path = [ pkgs.podman ]; + path = [pkgs.podman]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -321,11 +327,11 @@ script = '' podman volume inspect wavelog_partdb_uploads_f || podman volume create wavelog_partdb_uploads_f ''; - 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_pelican-data" = { - path = [ pkgs.podman ]; + path = [pkgs.podman]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -333,11 +339,11 @@ script = '' podman volume inspect wavelog_pelican-data || podman volume create wavelog_pelican-data ''; - 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_pelican-logs" = { - path = [ pkgs.podman ]; + path = [pkgs.podman]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -345,11 +351,11 @@ script = '' podman volume inspect wavelog_pelican-logs || podman volume create wavelog_pelican-logs ''; - 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-config" = { - path = [ pkgs.podman ]; + path = [pkgs.podman]; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -357,11 +363,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; @@ -369,11 +375,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; @@ -381,11 +387,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; @@ -393,8 +399,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 @@ -404,6 +410,6 @@ unitConfig = { Description = "Root target generated by compose2nix."; }; - wantedBy = [ "multi-user.target" ]; + wantedBy = ["multi-user.target"]; }; } diff --git a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml index fec045a..b60a28a 100644 --- a/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml +++ b/nix-system-configs/modules/songsheet/wavelog/docker-compose.yml @@ -12,6 +12,9 @@ services: # In docker env logs will be redirected to stderr - APP_ENV=docker + # Diable the update checking because the GitHub Rate limit + - CHECK_FOR_UPDATES=false + # Uncomment this, if you want to use the automatic database migration feature. With this you have you do not have to # run the doctrine:migrations:migrate commands on installation or upgrade. A database backup is written to the uploads/ # folder (under .automigration-backup), so you can restore it, if the migration fails. diff --git a/nix-system-configs/modules/system/traefik.nix b/nix-system-configs/modules/system/traefik.nix index 21ddc72..78e9583 100644 --- a/nix-system-configs/modules/system/traefik.nix +++ b/nix-system-configs/modules/system/traefik.nix @@ -363,7 +363,7 @@ in { rule = "Host(`pelican.prg-radio.org`)"; service = "pelican"; entryPoints = ["websecure"]; - tls = { certresolver = "acme"; }; + tls = {certresolver = "acme";}; }; # Matrix HTTP router for client requests (Element etc.)