Adjust variables to work with imports

This commit is contained in:
Andreas Zweili 2022-11-02 23:38:00 +01:00
parent dc12c1bf70
commit 554710c8f1
2 changed files with 4 additions and 6 deletions

View File

@ -1,4 +1,4 @@
{ inputs, domain, config, ... }:
{ inputs, config, ... }:
{
imports = [
"${inputs.self}/modules/docker"
@ -18,7 +18,7 @@
TTRSS_DB_NAME = "ttrssdb";
TTRSS_DB_PORT = "3306";
TTRSS_DB_HOST = "host.docker.internal";
TTRSS_SELF_URL_PATH = "${domain}";
TTRSS_SELF_URL_PATH = "https://ttrss.2li.ch";
};
environmentFiles = [ config.age.secrets.ttrssEnv.path ];
ports = [

View File

@ -1,4 +1,4 @@
{ config, custom, hostname, inputs, pkgs, ... }:
{ custom, hostname, inputs, pkgs, ... }:
let
domain = "ttrss.2li.ch";
in
@ -14,9 +14,7 @@ in
(import "${inputs.self}/modules/restic-server-mysql-client" {
time = "23:00"; inherit custom hostname inputs pkgs;
})
(import "${inputs.self}/modules/ttrss" {
inherit config domain inputs;
})
"${inputs.self}/modules/mariadb"
"${inputs.self}/modules/ttrss"
];
}