Commit 35011098 by Bach Dániel

fix upstart configs

parent f2ba2509
......@@ -12,10 +12,11 @@
- user: {{ pillar['user'] }}
/etc/init/agentdriver.conf:
file.copy:
file.managed:
- user: root
- group: root
- source: /home/{{ pillar['user'] }}/agentdriver/miscellaneous/agentdriver.conf
- template: jinja
- source: file:///home/{{ pillar['user'] }}/agentdriver/miscellaneous/agentdriver.conf
/var/lib/libvirt/serial:
file.directory:
......
......@@ -22,6 +22,13 @@ requirements:
- template: jinja
- source: salt://graphite/files/graphite.conf
/etc/init/graphite-carbon.conf:
file.managed:
- user: root
- group: root
- template: jinja
- source: salt://graphite/files/graphite-carbon.conf
/opt/graphite:
file.directory:
- makedirs: True
......
description "CIRCLE Cloud Graphite monitoring server"
start on runlevel [2345]
stop on runlevel [!2345]
respawn
respawn limit 30 30
setgid {{ pillar['graphite']['user'] }}
setuid {{ pillar['graphite']['user'] }}
env HOME=/home/{{ pillar['graphite']['user'] }}
env GRAPHITE_ROOT=/opt/graphite
env PYTHONPATH=/opt/graphite/lib
script
. $HOME/.virtualenvs/graphite/local/bin/activate
cd /opt/graphite/bin/
exec twistd --nodaemon --reactor=epoll --no_save carbon-cache
end script
......@@ -8,13 +8,10 @@ respawn limit 30 30
setgid {{ pillar['graphite']['user'] }}
setuid {{ pillar['graphite']['user'] }}
env HOME=/home/{{ pillar['graphite']['user'] }}
script
HOME=/home/{{ pillar['graphite']['user'] }}
. $HOME/.virtualenvs/graphite/local/bin/activate
cd /opt/graphite/bin/
killall carbon-cache.py || true
./carbon-cache.py start
cd /opt/graphite/webapp/graphite
python manage.py runserver [::]:8081
exec python manage.py runserver [::]:8081
end script
......@@ -22,3 +22,7 @@ graphite:
service:
- running
graphite-carbon:
service:
- running
......@@ -6,16 +6,18 @@
- mode: 700
/etc/init/storagecelery.conf:
file.copy:
file.managed:
- user: root
- group: root
- source: /home/{{ pillar['user'] }}/storagedriver/miscellaneous/storagecelery.conf
- template: jinja
- source: file:///home/{{ pillar['user'] }}/storagedriver/miscellaneous/storagecelery.conf
/etc/init/storage.conf:
file.copy:
file.managed:
- user: root
- group: root
- source: /home/{{ pillar['user'] }}/storagedriver/miscellaneous/storage.conf
- template: jinja
- source: file:///home/{{ pillar['user'] }}/storagedriver/miscellaneous/storage.conf
/datastore:
file.directory:
......
......@@ -6,7 +6,8 @@
- mode: 700
/etc/init/vncproxy.conf:
file.copy:
file.managed:
- user: root
- group: root
- source: /home/{{ pillar['user'] }}/vncproxy/miscellaneous/vncproxy.conf
- template: jinja
- source: file:///home/{{ pillar['user'] }}/vncproxy/miscellaneous/vncproxy.conf
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 sign in to comment