diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix
index ed47f647edd3..0815487d4a1f 100644
--- a/nixos/modules/services/databases/firebird.nix
+++ b/nixos/modules/services/databases/firebird.nix
@@ -43,17 +43,15 @@ in
enable = mkEnableOption "the Firebird super server";
package = mkOption {
- default = pkgs.firebirdSuper;
- defaultText = "pkgs.firebirdSuper";
+ default = pkgs.firebird;
+ defaultText = "pkgs.firebird";
type = types.package;
- /*
- Example: package = pkgs.firebirdSuper.override { icu =
- pkgs.icu; };
which is not recommended for compatibility
- reasons. See comments at the firebirdSuper derivation
- */
-
+ example = ''
+ package = pkgs.firebird_3;
+ '';
description = ''
- Which firebird derivation to use.
+ Which Firebird package to be installed: pkgs.firebird_3
+ For SuperServer use override: pkgs.firebird_3.override { superServer = true; };
'';
};
@@ -74,7 +72,7 @@ in
};
baseDir = mkOption {
- default = "/var/db/firebird"; # ubuntu is using /var/lib/firebird/2.1/data/.. ?
+ default = "/var/lib/firebird";
type = types.str;
description = ''
Location containing data/ and system/ directories.
@@ -111,6 +109,14 @@ in
cp ${firebird}/security2.fdb "${systemDir}"
fi
+ if ! test -e "${systemDir}/security3.fdb"; then
+ cp ${firebird}/security3.fdb "${systemDir}"
+ fi
+
+ if ! test -e "${systemDir}/security4.fdb"; then
+ cp ${firebird}/security4.fdb "${systemDir}"
+ fi
+
chmod -R 700 "${dataDir}" "${systemDir}" /var/log/firebird
'';