diff --git a/modules/powerdns-admin.nix b/modules/powerdns-admin.nix index 7c4e6bb..9683577 100644 --- a/modules/powerdns-admin.nix +++ b/modules/powerdns-admin.nix @@ -6,7 +6,7 @@ let in { imports = [ - ./podman.nix + #./podman.nix ./podman-postgresql.nix # for the database #./nginx.nix # for the webserver ]; @@ -14,24 +14,24 @@ in sops.secrets."powerdns-admin/db" = { }; sops.secrets."powerdns-admin/env" = { }; - #services.podman-postgresql."${pdnsa_database}" = { - # enable = true; - # image = "docker.io/library/postgres:15-alpine"; - # port = (lib.strings.toInt webdbport); - # passwordFile = config.sops.secrets."powerdns-admin/db".path; - #}; + services.podman-postgresql."powerdnsadmin" = { + enable = true; + image = "docker.io/library/postgres:15-alpine"; + port = (lib.strings.toInt webdbport); + passwordFile = config.sops.secrets."powerdns-admin/db".path; + }; - #virtualisation.oci-containers.containers.powerdnsadmin = { - # image = "docker.io/powerdnsadmin/pda-legacy"; - # environment = { - # TZ = "Europe/Berlin"; - # }; - # environmentFiles = [ config.sops.secrets."powerdns-admin/env".path ]; - # ports = [ - # "${webport}:80" - # ]; - # extraOptions = cfg.podman.extraOptions; - #}; + virtualisation.oci-containers.containers.powerdnsadmin = { + image = "docker.io/powerdnsadmin/pda-legacy"; + environment = { + TZ = "Europe/Berlin"; + }; + environmentFiles = [ config.sops.secrets."powerdns-admin/env".path ]; + ports = [ + "${webport}:80" + ]; + extraOptions = cfg.podman.extraOptions; + }; } # vim: set et ts=2 sw=2 ai: diff --git a/modules/powerdns-web.nix b/modules/powerdns-web.nix index 66330e1..ad1a389 100644 --- a/modules/powerdns-web.nix +++ b/modules/powerdns-web.nix @@ -1,10 +1,14 @@ { ... }: let domain = "powerdns.mc-fucker.cool"; - pdnsa_host = "100.64.0.6"; - pdnsa_port = "8000"; + #pdnsa_host = "100.64.0.6"; + pdnsa_host = "127.0.0.1"; + pdnsa_port = "8282"; in { + + imports = [ ./nginx.nix ]; + services.nginx.virtualHosts."${domain}" = { forceSSL = true; enableACME = true;