diff options
| author | Robin Gloster <mail@glob.in> | 2018-11-04 00:14:52 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-11-04 00:26:01 +0100 |
| commit | eadb9985819327f6bce7da87730d32e5018ee848 (patch) | |
| tree | 2a75bc3c780ea4d47c30588d9c386003e114ebd0 /nixos | |
| parent | 3fc7d5eb83804e10ae55b1ae9b102f88b1ea2b08 (diff) | |
| download | nixlib-eadb9985819327f6bce7da87730d32e5018ee848.tar nixlib-eadb9985819327f6bce7da87730d32e5018ee848.tar.gz nixlib-eadb9985819327f6bce7da87730d32e5018ee848.tar.bz2 nixlib-eadb9985819327f6bce7da87730d32e5018ee848.tar.lz nixlib-eadb9985819327f6bce7da87730d32e5018ee848.tar.xz nixlib-eadb9985819327f6bce7da87730d32e5018ee848.tar.zst nixlib-eadb9985819327f6bce7da87730d32e5018ee848.zip | |
gitlab module: fix config handling
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index ce1cb6ad37f2..aa72cda70453 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -552,10 +552,9 @@ in { gnupg ]; preStart = '' - ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret - cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db - cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config + rm -rf ${cfg.statePath}/config + mkdir ${cfg.statePath}/config if [ -e ${cfg.statePath}/lib ]; then rm ${cfg.statePath}/lib fi @@ -569,6 +568,8 @@ in { ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb ''} cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION + cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config + ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret # JSON is a subset of YAML ln -sf ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml |