diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-05-27 05:13:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-27 05:13:50 +0200 |
commit | 5619e3eb35d07a398664fc198babd649d4793a5a (patch) | |
tree | d6895dc82f098eb8874471b3c19c96b9fed3fa9c /nixos | |
parent | 655745049eb6cf5b0fd6e9b7b9465bc999181b88 (diff) | |
parent | 97d9e7849be92601eccbdb8e8820a89ee0802c80 (diff) |
Merge pull request #124147 from superherointj/package-firebird-v4.0.0
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/databases/firebird.nix | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index ed47f647edd36..0815487d4a1f2 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: <code>package = pkgs.firebirdSuper.override { icu = - pkgs.icu; };</code> which is not recommended for compatibility - reasons. See comments at the firebirdSuper derivation - */ - + example = '' + <code>package = pkgs.firebird_3;</code> + ''; description = '' - Which firebird derivation to use. + Which Firebird package to be installed: <code>pkgs.firebird_3</code> + For SuperServer use override: <code>pkgs.firebird_3.override { superServer = true; };</code> ''; }; @@ -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 ''; |