Skip to content
Snippets Groups Projects
Commit 315baa75 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files

Merge branch 'postgres_fullpath' into 'master'

Use Postgres bin path

Postgres on Ubuntu doesn't include the initdb and postgres commands on the PATH, but are still available from the postgres bin directory.

Updated the Makefile to use pg_config to find the postgres bin directory, and use it for the initdb command, and for the postgres command in the procfile

Works towards completing issue #7

See merge request !9
parents ad98bee9 62f89243
No related branches found
No related tags found
No related merge requests found
gitlab_repo = https://gitlab.com/gitlab-org/gitlab-ce.git
gitlab_shell_repo = https://gitlab.com/gitlab-org/gitlab-shell.git
gitlab_development_root = $(shell pwd)
postgres_bin_dir = $(shell pg_config --bindir)
 
all: gitlab-setup gitlab-shell-setup support-setup
 
Loading
Loading
@@ -60,7 +61,7 @@ support-setup: Procfile redis postgresql .bundle
@echo "***********************************"
 
Procfile:
sed "s|/home/git|${gitlab_development_root}|g" $@.example > $@
sed "s|/home/git|${gitlab_development_root}|g;s|postgres |${postgres_bin_dir}/postgres |" $@.example > $@
 
redis: redis/redis.conf
 
Loading
Loading
@@ -70,7 +71,7 @@ redis/redis.conf:
postgresql: postgresql/data/PG_VERSION
 
postgresql/data/PG_VERSION:
initdb -E utf-8 postgresql/data
${postgres_bin_dir}/initdb -E utf-8 postgresql/data
 
.bundle:
bundle install --jobs 4
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment