Commit a1ad668d authored by Jacob Vosmaer's avatar Jacob Vosmaer

Add influxdb to Procfile and "run"

parent 8016732a
...@@ -39,3 +39,6 @@ grafana/public ...@@ -39,3 +39,6 @@ grafana/public
grafana/conf grafana/conf
grafana/vendor grafana/vendor
grafana/*.tar.gz grafana/*.tar.gz
influxdb/meta/
influxdb/wal/
influxdb/influxdb.conf
...@@ -161,6 +161,12 @@ gitlab-workhorse/.git/pull: ...@@ -161,6 +161,12 @@ gitlab-workhorse/.git/pull:
cd ${gitlab_development_root}/gitlab-workhorse && \ cd ${gitlab_development_root}/gitlab-workhorse && \
git pull --ff-only git pull --ff-only
influxdb-setup: influxdb/influxdb.conf
cd influxdb && make
influxdb/influxdb.conf:
sed -e "s|/home/git|${gitlab_development_root}|g" $@.example > $@
clean-config: clean-config:
rm -f \ rm -f \
gitlab/config/gitlab.yml \ gitlab/config/gitlab.yml \
......
...@@ -5,4 +5,5 @@ postgresql: support/postgresql-signal-wrapper postgres -D /home/git/postgresql/d ...@@ -5,4 +5,5 @@ postgresql: support/postgresql-signal-wrapper postgres -D /home/git/postgresql/d
gitlab-workhorse: PATH=/home/git/gitlab-workhorse:$PATH gitlab-workhorse -authSocket /home/git/gitlab.socket -listenAddr localhost:$port -documentRoot /home/git/gitlab/public -developmentMode gitlab-workhorse: PATH=/home/git/gitlab-workhorse:$PATH gitlab-workhorse -authSocket /home/git/gitlab.socket -listenAddr localhost:$port -documentRoot /home/git/gitlab/public -developmentMode
rails-web: RAILS_ENV=development support/exec-cd gitlab bin/web start_foreground rails-web: RAILS_ENV=development support/exec-cd gitlab bin/web start_foreground
rails-background-jobs: RAILS_ENV=development support/exec-cd gitlab bin/background_jobs start_foreground rails-background-jobs: RAILS_ENV=development support/exec-cd gitlab bin/background_jobs start_foreground
#workhorse-stunnel: support/workhorse-stunnel localhost:3443 /home/git/gitlab.socket /home/git/localhost.pem #workhorse-stunnel: support/workhorse-stunnel localhost:3443 /home/git/gitlab.socket /home/git/localhost.pem
\ No newline at end of file #influxdb: influxdb/bin/influxd -config influxdb/influxdb.conf
\ No newline at end of file
This diff is collapsed.
...@@ -20,7 +20,7 @@ foreman_start() { ...@@ -20,7 +20,7 @@ foreman_start() {
} }
db() { db() {
foreman_start -c all=0,redis=1,postgresql=1,openldap=1 foreman_start -c all=0,redis=1,postgresql=1,openldap=1,influxdb=1
} }
app() { app() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment