fixup! gitlab: 8.0.5 -> 8.5.0, service improvements

Some debugging and development leftovers.

+4 -4
+4 -4
nixos/modules/services/misc/gitlab.nix
··· 39 39 ''; 40 40 41 41 gitlabConfig = { 42 + # These are the default settings from config/gitlab.example.yml 42 43 production = flip recursiveUpdate cfg.extraConfig { 43 44 gitlab = { 44 45 host = cfg.host; ··· 52 53 default_projects_features = { 53 54 issues = true; 54 55 merge_requests = true; 55 - wiki = false; 56 + wiki = true; 56 57 snippets = false; 57 58 builds = true; 58 59 }; ··· 241 242 242 243 extraConfig = mkOption { 243 244 type = types.attrs; 244 - default = ""; 245 + default = {}; 245 246 example = { 246 247 gitlab = { 247 248 default_projects_features = { ··· 348 349 gitAndTools.git 349 350 openssh 350 351 nodejs 351 - sudo 352 352 ]; 353 353 preStart = '' 354 354 mkdir -p ${cfg.backupPath} ··· 400 400 401 401 if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then 402 402 if ! test -e "${cfg.statePath}/db-created"; then 403 - psql postgres -c "CREATE ROLE gitlab WITH LOGIN CREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" 403 + psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" 404 404 ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true 405 405 touch "${cfg.statePath}/db-created" 406 406