diff options
| author | Kristian Lyngstol <kly@kly.no> | 2016-11-06 17:00:05 +0100 |
|---|---|---|
| committer | Kristian Lyngstol <kly@kly.no> | 2016-11-06 17:00:05 +0100 |
| commit | a76dadd993c1ea15f294b722649ba13f5f7bfd36 (patch) | |
| tree | 34104dcea3c76e7fafb6724d275e6642d2524917 | |
| parent | 2bbd9e130d12090314cca8c2752f69f846c82cb3 (diff) | |
Switch from graphite-web to graphite-api
Closes #130
Closes #131
Could clean it up more, I suppose.
| -rwxr-xr-x | build/test/dummy-graphite.start | 8 | ||||
| -rw-r--r-- | build/test/gondul-graphite-test.Dockerfile | 21 |
2 files changed, 12 insertions, 17 deletions
diff --git a/build/test/dummy-graphite.start b/build/test/dummy-graphite.start index 9d83cfb..6b69005 100755 --- a/build/test/dummy-graphite.start +++ b/build/test/dummy-graphite.start @@ -1,11 +1,5 @@ #!/usr/bin/env bash -if [ ! -r /var/lib/graphite/graphite.db ]; then - # graphite-manage migrate - django-admin migrate --settings=graphite.settings - # graphite-manage createsuperuser --noinput --username=admin --email root@localhost.localdomain - django-admin createsuperuser --settings=graphite.settings --noinput --username=admin --email root@localhost.localdomain -fi chown -R _graphite:_graphite /var/lib/graphite/ -service apache2 start +service graphite-api start service carbon-cache start while true; do sleep 10; done diff --git a/build/test/gondul-graphite-test.Dockerfile b/build/test/gondul-graphite-test.Dockerfile index ec79c52..e472d3b 100644 --- a/build/test/gondul-graphite-test.Dockerfile +++ b/build/test/gondul-graphite-test.Dockerfile @@ -1,14 +1,15 @@ -FROM ubuntu:yakkety -RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y graphite-carbon graphite-web apache2 -RUN apt-get install -y libapache2-mod-wsgi -RUN cp /usr/share/graphite-web/apache2-graphite.conf /etc/apache2/sites-available/graphite-web.conf -RUN sed -i 's/<\/VirtualHost>//' /etc/apache2/sites-available/graphite-web.conf -RUN echo 'WSGIApplicationGroup %{GLOBAL}' >> /etc/apache2/sites-available/graphite-web.conf -RUN echo '</VirtualHost>' >> /etc/apache2/sites-available/graphite-web.conf +FROM debian:stretch +RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y graphite-carbon graphite-api gunicorn3 +RUN sed -i s/127.0.0.1:8542/0.0.0.0:80/g /etc/default/graphite-api +#RUN apt-get install -y libapache2-mod-wsgi +#RUN cp /usr/share/graphite-web/apache2-graphite.conf /etc/apache2/sites-available/graphite-web.conf +#RUN sed -i 's/<\/VirtualHost>//' /etc/apache2/sites-available/graphite-web.conf +#RUN echo 'WSGIApplicationGroup %{GLOBAL}' >> /etc/apache2/sites-available/graphite-web.conf +#RUN echo '</VirtualHost>' >> /etc/apache2/sites-available/graphite-web.conf -RUN a2ensite graphite-web -RUN a2dissite 000-default -RUN a2enmod wsgi +#RUN a2ensite graphite-web +#RUN a2dissite 000-default +#RUN a2enmod wsgi RUN sed -i 's/false/true/g' /etc/default/graphite-carbon ADD build/test/dummy-graphite.start /dummy-graphite.start ADD build/storage-schemas.conf /etc/carbon/ |