ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

fixup! gitlab: 8.0.5 -> 8.5.0, service improvements

Browse Source 
Some debugging and development leftovers.
This commit is contained in:
Franz Pletz 2016-02-23 22:55:35 +01:00
parent bcfa59bf82
commit 3fd51a9ab2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/misc/gitlab.nix
View File

@ -39,6 +39,7 @@ let
''; '';
gitlabConfig = { gitlabConfig = {
# These are the default settings from config/gitlab.example.yml
production = flip recursiveUpdate cfg.extraConfig { production = flip recursiveUpdate cfg.extraConfig {
gitlab = { gitlab = {
host = cfg.host; host = cfg.host;
@ -52,7 +53,7 @@ let
default_projects_features = { default_projects_features = {
issues = true; issues = true;
merge_requests = true; merge_requests = true;
wiki = false; wiki = true;
snippets = false; snippets = false;
builds = true; builds = true;
}; };
@ -241,7 +242,7 @@ in {
extraConfig = mkOption { extraConfig = mkOption {
type = types.attrs; type = types.attrs;
default = ""; default = {};
example = { example = {
gitlab = { gitlab = {
default_projects_features = { default_projects_features = {
@ -348,7 +349,6 @@ in {
gitAndTools.git gitAndTools.git
openssh openssh
nodejs nodejs
sudo
]; ];
preStart = '' preStart = ''
mkdir -p ${cfg.backupPath} mkdir -p ${cfg.backupPath}
@ -400,7 +400,7 @@ in {
if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
if ! test -e "${cfg.statePath}/db-created"; then if ! test -e "${cfg.statePath}/db-created"; then
psql postgres -c "CREATE ROLE gitlab WITH LOGIN CREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true
touch "${cfg.statePath}/db-created" touch "${cfg.statePath}/db-created"