summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSimon Lackerbauer <simon@lackerbauer.com>2018-03-14 14:14:03 +0100
committerRobin Gloster <mail@glob.in>2018-03-22 02:29:28 +0100
commit1b559058064992e5d8cd951f42232793aa99d960 (patch)
treeab06dc6f4d48a1171f4c780d50bfffdd8f25de3a /nixos
parent73a7f984d64f1c3f3ad8bd4677cb64d4f3d70055 (diff)
downloadnixpkgs-1b559058064992e5d8cd951f42232793aa99d960.tar
nixpkgs-1b559058064992e5d8cd951f42232793aa99d960.tar.gz
nixpkgs-1b559058064992e5d8cd951f42232793aa99d960.tar.bz2
nixpkgs-1b559058064992e5d8cd951f42232793aa99d960.tar.lz
nixpkgs-1b559058064992e5d8cd951f42232793aa99d960.tar.xz
nixpkgs-1b559058064992e5d8cd951f42232793aa99d960.tar.zst
nixpkgs-1b559058064992e5d8cd951f42232793aa99d960.zip
gitlab: 10.3.4 -> 10.5.4
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/gitlab.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 76d892b1681..20d7ec90dcc 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -143,6 +143,7 @@ let
     GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
     GITLAB_STATE_PATH = "${cfg.statePath}";
     GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
+    SCHEMA = "${cfg.statePath}/db/schema.rb";
     GITLAB_LOG_PATH = "${cfg.statePath}/log";
     GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}";
     GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
@@ -566,6 +567,7 @@ in {
         mkdir -p ${cfg.statePath}/tmp/pids
         mkdir -p ${cfg.statePath}/tmp/sockets
         mkdir -p ${cfg.statePath}/shell
+        mkdir -p ${cfg.statePath}/db
 
         rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
         mkdir -p ${cfg.statePath}/config
@@ -588,6 +590,7 @@ in {
         touch ${gitlabEnv.HOME}/.ssh/authorized_keys
         chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
 
+        cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
         cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
         ${optionalString cfg.smtp.enable ''
           ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb