diff options
| author | Robin Gloster <mail@glob.in> | 2017-09-02 23:31:26 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-09-02 23:31:26 +0200 |
| commit | eedffc52777d9ff6c5a7fce2f07fa41916c569ca (patch) | |
| tree | 7f57c8056be77e096c24f204ebb6cac4aff8f878 /nixos | |
| parent | aaff3fa5f3605cb3a2f86ab3982b98a7afa60485 (diff) | |
| download | nixlib-eedffc52777d9ff6c5a7fce2f07fa41916c569ca.tar nixlib-eedffc52777d9ff6c5a7fce2f07fa41916c569ca.tar.gz nixlib-eedffc52777d9ff6c5a7fce2f07fa41916c569ca.tar.bz2 nixlib-eedffc52777d9ff6c5a7fce2f07fa41916c569ca.tar.lz nixlib-eedffc52777d9ff6c5a7fce2f07fa41916c569ca.tar.xz nixlib-eedffc52777d9ff6c5a7fce2f07fa41916c569ca.tar.zst nixlib-eedffc52777d9ff6c5a7fce2f07fa41916c569ca.zip | |
gitlab module: fix permissions and path
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 75bb366ca407..fcb7aaa62716 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -138,7 +138,7 @@ let makeWrapper ${cfg.packages.gitlab.ruby-env}/bin/bundle $out/bin/gitlab-bundle \ ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \ --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \ - --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip config.services.postgresql.package ]}:$PATH' \ + --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package ]}:$PATH' \ --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \ --run 'cd ${cfg.packages.gitlab}/share/gitlab' makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \ @@ -559,7 +559,6 @@ in { mkdir -p ${gitlabEnv.HOME}/.ssh touch ${gitlabEnv.HOME}/.ssh/authorized_keys chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/ - chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}/ cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config ${optionalString cfg.smtp.enable '' @@ -607,7 +606,8 @@ in { # Change permissions in the last step because some of the # intermediary scripts like to create directories as root. chown -R ${cfg.user}:${cfg.group} ${cfg.statePath} - chmod -R u+rwX,go-rwx+X ${cfg.statePath} + chmod -R ug+rwX,o-rwx+X ${cfg.statePath} + chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME} ''; serviceConfig = { |