fixup! gitlab: 8.0.5 -> 8.5.0, service improvements

Some debugging and development leftovers.

Changed files
+4 -4
nixos
modules
services
misc
+4 -4
nixos/modules/services/misc/gitlab.nix
···
'';
gitlabConfig = {
production = flip recursiveUpdate cfg.extraConfig {
gitlab = {
host = cfg.host;
···
default_projects_features = {
issues = true;
merge_requests = true;
-
wiki = false;
snippets = false;
builds = true;
};
···
extraConfig = mkOption {
type = types.attrs;
-
default = "";
example = {
gitlab = {
default_projects_features = {
···
gitAndTools.git
openssh
nodejs
-
sudo
];
preStart = ''
mkdir -p ${cfg.backupPath}
···
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}'"
${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true
touch "${cfg.statePath}/db-created"
···
'';
gitlabConfig = {
+
# These are the default settings from config/gitlab.example.yml
production = flip recursiveUpdate cfg.extraConfig {
gitlab = {
host = cfg.host;
···
default_projects_features = {
issues = true;
merge_requests = true;
+
wiki = true;
snippets = false;
builds = true;
};
···
extraConfig = mkOption {
type = types.attrs;
+
default = {};
example = {
gitlab = {
default_projects_features = {
···
gitAndTools.git
openssh
nodejs
];
preStart = ''
mkdir -p ${cfg.backupPath}
···
if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
if ! test -e "${cfg.statePath}/db-created"; then
+
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"