diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-23 22:55:35 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-26 07:08:31 +0100 |
| commit | 3fd51a9ab20660ef4153436ece24b23dc65bccc0 (patch) | |
| tree | 5b870c14a8ae778bb73c65cd4b68ef5fd587437c /nixos | |
| parent | bcfa59bf822dc696e963d7abccfdff2e58e70525 (diff) | |
fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
Some debugging and development leftovers.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 074f1a040b8bf..eef23a0ae42c1 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -39,6 +39,7 @@ let ''; gitlabConfig = { + # These are the default settings from config/gitlab.example.yml production = flip recursiveUpdate cfg.extraConfig { gitlab = { host = cfg.host; @@ -52,7 +53,7 @@ let default_projects_features = { issues = true; merge_requests = true; - wiki = false; + wiki = true; snippets = false; builds = true; }; @@ -241,7 +242,7 @@ in { extraConfig = mkOption { type = types.attrs; - default = ""; + default = {}; example = { gitlab = { default_projects_features = { @@ -348,7 +349,6 @@ in { gitAndTools.git openssh nodejs - sudo ]; preStart = '' mkdir -p ${cfg.backupPath} @@ -400,7 +400,7 @@ in { if [ "${cfg.databaseHost}" = "127.0.0.1" ]; 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 touch "${cfg.statePath}/db-created" |