updated tandoor and ihatemoney config

modules/ihatemoney.nix

@@ -1,11 +1,14 @@
 { ... }:
 let
-  port = "8000";
-  db = "ihatemoney";
-  domain = "geld.mc-fucker.cool";
+  cfg = import ./vars.nix;
+  port = cfg.ihatemoney.port;
+  db = cfg.ihatemoney.db;
+  domain = cfg.ihatemoney.domain;
 in
 {
-  services.nginx.enable = true;
+
+  imports = [ ./nginx.nix ];
+
   services.nginx.virtualHosts."${domain}" = {
     forceSSL = true;
     enableACME = true;
@@ -18,11 +21,6 @@ in
     '';
   };
 
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "dev@mc-fucker.cool";
-  };
-
   virtualisation.oci-containers.containers.ihatemoney = {
     image = "cfa3c41cf3ac";
     environment = {
@@ -34,7 +32,7 @@ in
       MAIL_USE_TLS = "True";
       DEBUG = "False";
     };
-    ports = [ "${port}:8000" ];
+    ports = [ "${port}:${port}" ];
     environmentFiles = [ /etc/nixos/keys/ihatemoney-env ];
   };
 
@@ -51,8 +49,6 @@ in
     authentication = "host ${db} ${db} 10.88.0.0/16 md5";
   };
 
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
-
   services.postgresqlBackup.databases = [ "ihatemoney" ];
 
 }

modules/tandoor.nix

@@ -1,18 +1,19 @@
 { config, lib, ... }:
 let
-  pg_user = "tandoor";
-  tandoor_port = "8080";
-  domain = "kochen.mc-fucker.cool";
+  cfg = import ./vars.nix;
+  pg_user = cfg.tandoor.db;
+  port = cfg.tandoor.port;
+  domain = cfg.tandoor.domain;
 in
 
 {
 
   virtualisation.oci-containers.containers.tandoor = {
-    image = "vabene1111/recipes";
+    image = "docker.io/vabene1111/recipes";
     environment = {
       DEBUG = "0";
       DB_ENGINE = "django.db.backends.postgresql";
-      POSTGRES_HOST = "10.88.0.1";
+      POSTGRES_HOST = cfg.podman.hostIP;
       POSTGRES_PORT = "5432";
       POSTGRES_USER = pg_user;
       POSTGRES_DB = pg_user;
@@ -20,8 +21,9 @@ in
       SECRET_KEY = builtins.readFile /etc/nixos/keys/tandoor-secret;
     };
     ports = [
-      "${tandoor_port}:${tandoor_port}"
+      "${port}:${port}"
     ];
+    extraOptions = cfg.podman.extraOptions;
     volumes = [
       "/var/lib/tandoor/mediafiles:/opt/recipes/mediafiles"
       "/var/lib/tandoor/staticfiles:/opt/recipes/staticfiles"
@@ -50,11 +52,11 @@ in
     enableACME = true;
     locations = {
       "/" = {
-        proxyPass = "http://127.0.0.1:${tandoor_port}";
+        proxyPass = "http://127.0.0.1:${port}";
         extraConfig = ''
           proxy_set_header  Host $host;
           proxy_set_header  X-Forwarded-Proto $scheme;
-          proxy_redirect    http://127.0.0.1:${tandoor_port} https://${domain};
+          proxy_redirect    http://127.0.0.1:${port} https://${domain};
           access_log        /var/log/nginx/${domain}_access.log;
           error_log         /var/log/nginx/${domain}_error.log;
         '';

modules/vars.nix

@@ -1,5 +1,11 @@
 {
 
+  ihatemoney = {
+    db = "ihatemoney";
+    domain = "geld.mc-fucker.cool";
+    port = "8000";
+  };
+
   invidious = {
     domain = "yt.mc-fucker.cool";
     db_user = "kemal";
@@ -21,6 +27,12 @@
     hostIP = "10.88.0.1";
   };
 
+  tandoor = {
+    db = "tandoor";
+    domain = "kochen.mc-fucker.cool";
+    port = "8080";
+  };
+
   zabbix = {
     domain = "zbx.mc-fucker.cool";
     db = "zabbix";