diff options
| author | talyz <kim.lindberger@gmail.com> | 2019-09-24 08:58:32 +0200 |
|---|---|---|
| committer | talyz <kim.lindberger@gmail.com> | 2019-09-24 15:04:19 +0200 |
| commit | ec958d46acf6ec6e544a0045fcc4c7e3ccd51d96 (patch) | |
| tree | 016a95e04a8a478a8136fcfc5939278baf93f06e /nixos | |
| parent | d70eba7ab354778ec292e06799fef2c8982e8952 (diff) | |
| download | nixlib-ec958d46acf6ec6e544a0045fcc4c7e3ccd51d96.tar nixlib-ec958d46acf6ec6e544a0045fcc4c7e3ccd51d96.tar.gz nixlib-ec958d46acf6ec6e544a0045fcc4c7e3ccd51d96.tar.bz2 nixlib-ec958d46acf6ec6e544a0045fcc4c7e3ccd51d96.tar.lz nixlib-ec958d46acf6ec6e544a0045fcc4c7e3ccd51d96.tar.xz nixlib-ec958d46acf6ec6e544a0045fcc4c7e3ccd51d96.tar.zst nixlib-ec958d46acf6ec6e544a0045fcc4c7e3ccd51d96.zip | |
nixos/gitlab: Fix evaluation failure when postgresql is disabled
config.services.postgresql.package is only defined when the postgresql service is activated, which means we fail to evaluate when databaseCreateLocally == false. Fix this by using the default postgresql package when the postgresql service is disabled.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 1e1eb0fd9a11..1b6002498c68 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -7,6 +7,11 @@ let ruby = cfg.packages.gitlab.ruby; + postgresqlPackage = if config.services.postgresql.enable then + config.services.postgresql.package + else + pkgs.postgresql; + gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url; @@ -138,7 +143,7 @@ let mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ - --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \ + --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' ''; @@ -153,7 +158,7 @@ let mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ - --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \ + --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' ''; }; @@ -667,7 +672,7 @@ in { wantedBy = [ "multi-user.target" ]; environment = gitlabEnv; path = with pkgs; [ - config.services.postgresql.package + postgresqlPackage gitAndTools.git ruby openssh @@ -748,7 +753,7 @@ in { wantedBy = [ "multi-user.target" ]; environment = gitlabEnv; path = with pkgs; [ - config.services.postgresql.package + postgresqlPackage gitAndTools.git openssh nodejs |