mirror of
https://github.com/versia-pub/activitypub.git
synced 2025-12-06 06:38:20 +01:00
fix: let module setup be correct
This commit is contained in:
parent
9db98ab6d9
commit
09874fce92
14
module.nix
14
module.nix
|
|
@ -43,6 +43,12 @@ let
|
||||||
ensureDatabases = lib.singleton cfg.database.dbname;
|
ensureDatabases = lib.singleton cfg.database.dbname;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
dbconfone = lib.mkIf cfg.database.createLocally {
|
||||||
|
systemd.services.lysandap.serviceConfig.Environment.DATABASE_URL = "postgresql:///${cfg.database.user}@localhost/${cfg.database.dbname}";
|
||||||
|
};
|
||||||
|
dbconftwo = lib.mkIf (cfg.database.createLocally == false) {
|
||||||
|
systemd.services.lysandap.serviceConfig.Environment.DATABASE_URL = "postgresql://${cfg.database.user}:${cfg.database.passwordFile}@${cfg.database.host}:${toString cfg.database.port}/${cfg.database.dbname}";
|
||||||
|
};
|
||||||
nginxConfig = lib.mkIf cfg.nginx.enable {
|
nginxConfig = lib.mkIf cfg.nginx.enable {
|
||||||
services.nginx =
|
services.nginx =
|
||||||
let
|
let
|
||||||
|
|
@ -223,12 +229,8 @@ in
|
||||||
config = mkIf cfg.enable (lib.mkMerge [
|
config = mkIf cfg.enable (lib.mkMerge [
|
||||||
localDatabaseConfig
|
localDatabaseConfig
|
||||||
nginxConfig
|
nginxConfig
|
||||||
lib.mkIf cfg.database.createLocally {
|
dbconfone
|
||||||
systemd.services.lysandap.serviceConfig.Environment.DATABASE_URL = "postgresql:///${cfg.database.user}@localhost/${cfg.database.dbname}";
|
dbconftwo
|
||||||
}
|
|
||||||
lib.mkIf (cfg.database.createLocally == false) {
|
|
||||||
systemd.services.lysandap.serviceConfig.Environment.DATABASE_URL = "postgresql://${cfg.database.user}:${cfg.database.passwordFile}@${cfg.database.host}:${toString cfg.database.port}/${cfg.database.dbname}";
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
systemd.services.lysandap = {
|
systemd.services.lysandap = {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue