diff options
| author | Robin Gloster <mail@glob.in> | 2017-08-23 14:55:14 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-09-02 23:30:49 +0200 |
| commit | 45605db3e02a5d6937bae65b3f24f44672390baa (patch) | |
| tree | e5853c03789d3c3842f6e50c68a21986d939e672 /nixos | |
| parent | 0156db2da530a52265fbccc8ad7747b00ee8aaf3 (diff) | |
| download | nixpkgs-45605db3e02a5d6937bae65b3f24f44672390baa.tar nixpkgs-45605db3e02a5d6937bae65b3f24f44672390baa.tar.gz nixpkgs-45605db3e02a5d6937bae65b3f24f44672390baa.tar.bz2 nixpkgs-45605db3e02a5d6937bae65b3f24f44672390baa.tar.lz nixpkgs-45605db3e02a5d6937bae65b3f24f44672390baa.tar.xz nixpkgs-45605db3e02a5d6937bae65b3f24f44672390baa.tar.zst nixpkgs-45605db3e02a5d6937bae65b3f24f44672390baa.zip | |
gitlab: fix postgres calls
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index d6e82214a5e..1b0333d3859 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -583,14 +583,14 @@ in { if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then if ! test -e "${cfg.statePath}/db-created"; then - psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" - ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName} || true + ${pkgs.sudo}/bin/sudo -u postgres psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'" + ${pkgs.sudo}/bin/sudo -u postgres ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName} touch "${cfg.statePath}/db-created" fi fi # enable required pg_trgm extension for gitlab - psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" + ${pkgs.sudo}/bin/sudo -u postgres psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" # Always do the db migrations just to be sure the database is up-to-date ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production |