nixos/bacula: fix postgresql config and remove unneeded quotation marks

The module falsely disabled postgresql completely when the bacula-sd was not enabled.
Quotation marks are not necessary and only useful in `name` fields.

Changed files
+20 -20
nixos
modules
services
backup
+20 -20
nixos/modules/services/backup/bacula.nix
···
Client {
Name = "${fd_cfg.name}";
FDPort = ${toString fd_cfg.port};
-
WorkingDirectory = "${libDir}";
-
Pid Directory = "/run";
${fd_cfg.extraClientConfig}
}
${concatStringsSep "\n" (mapAttrsToList (name: value: ''
Director {
Name = "${name}";
-
Password = "${value.password}";
-
Monitor = "${value.monitor}";
}
'') fd_cfg.director)}
···
Storage {
Name = "${sd_cfg.name}";
SDPort = ${toString sd_cfg.port};
-
WorkingDirectory = "${libDir}";
-
Pid Directory = "/run";
${sd_cfg.extraStorageConfig}
}
···
Autochanger {
Name = "${name}";
Device = ${concatStringsSep ", " (map (a: "\"${a}\"") value.devices)};
-
Changer Device = "${value.changerDevice}";
-
Changer Command = "${value.changerCommand}";
${value.extraAutochangerConfig}
}
'') sd_cfg.autochanger)}
···
${concatStringsSep "\n" (mapAttrsToList (name: value: ''
Device {
Name = "${name}";
-
Archive Device = "${value.archiveDevice}";
-
Media Type = "${value.mediaType}";
${value.extraDeviceConfig}
}
'') sd_cfg.device)}
···
${concatStringsSep "\n" (mapAttrsToList (name: value: ''
Director {
Name = "${name}";
-
Password = "${value.password}";
-
Monitor = "${value.monitor}";
}
'') sd_cfg.director)}
···
''
Director {
Name = "${dir_cfg.name}";
-
Password = "${dir_cfg.password}";
DirPort = ${toString dir_cfg.port};
-
Working Directory = "${libDir}";
-
Pid Directory = "/run/";
-
QueryFile = "${pkgs.bacula}/etc/query.sql";
${dir_cfg.extraDirectorConfig}
}
Catalog {
-
Name = "PostgreSQL";
-
dbname = "bacula";
-
user = "bacula";
}
Messages {
···
};
};
-
services.postgresql.enable = dir_cfg.enable == true;
systemd.services.bacula-dir = mkIf dir_cfg.enable {
after = [ "network.target" "postgresql.service" ];
···
Client {
Name = "${fd_cfg.name}";
FDPort = ${toString fd_cfg.port};
+
WorkingDirectory = ${libDir};
+
Pid Directory = /run;
${fd_cfg.extraClientConfig}
}
${concatStringsSep "\n" (mapAttrsToList (name: value: ''
Director {
Name = "${name}";
+
Password = ${value.password};
+
Monitor = ${value.monitor};
}
'') fd_cfg.director)}
···
Storage {
Name = "${sd_cfg.name}";
SDPort = ${toString sd_cfg.port};
+
WorkingDirectory = ${libDir};
+
Pid Directory = /run;
${sd_cfg.extraStorageConfig}
}
···
Autochanger {
Name = "${name}";
Device = ${concatStringsSep ", " (map (a: "\"${a}\"") value.devices)};
+
Changer Device = ${value.changerDevice};
+
Changer Command = ${value.changerCommand};
${value.extraAutochangerConfig}
}
'') sd_cfg.autochanger)}
···
${concatStringsSep "\n" (mapAttrsToList (name: value: ''
Device {
Name = "${name}";
+
Archive Device = ${value.archiveDevice};
+
Media Type = ${value.mediaType};
${value.extraDeviceConfig}
}
'') sd_cfg.device)}
···
${concatStringsSep "\n" (mapAttrsToList (name: value: ''
Director {
Name = "${name}";
+
Password = ${value.password};
+
Monitor = ${value.monitor};
}
'') sd_cfg.director)}
···
''
Director {
Name = "${dir_cfg.name}";
+
Password = ${dir_cfg.password};
DirPort = ${toString dir_cfg.port};
+
Working Directory = ${libDir};
+
Pid Directory = /run/;
+
QueryFile = ${pkgs.bacula}/etc/query.sql;
${dir_cfg.extraDirectorConfig}
}
Catalog {
+
Name = PostgreSQL;
+
dbname = bacula;
+
user = bacula;
}
Messages {
···
};
};
+
services.postgresql.enable = lib.mkIf dir_cfg.enable true;
systemd.services.bacula-dir = mkIf dir_cfg.enable {
after = [ "network.target" "postgresql.service" ];