From 60b0db0e08197b9fd773a417ed96000841a905a5 Mon Sep 17 00:00:00 2001
From: Markus Mueller <john.subscriber@markus.institute>
Date: Sat, 14 Oct 2017 20:58:02 +0000
Subject: [PATCH] gitlab: link tmp/ directory to writable path
---
nixos/modules/services/misc/gitlab.nix | 1 +
pkgs/applications/version-management/gitlab/default.nix | 2 ++
2 files changed, 3 insertions(+)
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 38c73a13de9d..14c184c3d685 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -581,6 +581,7 @@ in {
mkdir -p ${cfg.statePath}/{log,uploads}
ln -sf ${cfg.statePath}/log /run/gitlab/log
ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
+ ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
chown -R ${cfg.user}:${cfg.group} /run/gitlab
# Prepare home directory
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 93829b05dae9..657221d4b420 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -84,12 +84,14 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
+ rm -r tmp
mkdir -p $out/share
cp -r . $out/share/gitlab
rm -rf $out/share/gitlab/log
ln -sf /run/gitlab/log $out/share/gitlab/log
ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads
ln -sf /run/gitlab/config $out/share/gitlab/config
+ ln -sf /run/gitlab/tmp $out/share/gitlab/tmp
# rake tasks to mitigate CVE-2017-0882
# see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/