From 0d09abe3dd58ce76b36c1f4eb0e63d21dbb8e940 Mon Sep 17 00:00:00 2001
From: Bach Dániel <bd@ik.bme.hu>
Date: Wed, 5 Nov 2014 13:12:20 +0100
Subject: [PATCH] manager: fix postactivate template
---
salt/manager/files/postactivate | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/salt/manager/files/postactivate b/salt/manager/files/postactivate
index cd00bf5..b413674 100644
--- a/salt/manager/files/postactivate
+++ b/salt/manager/files/postactivate
@@ -17,8 +17,10 @@ export DJANGO_MEMCACHED='localhost:11211'
#export DJANGO_SAML_GROUP_OWNER_ATTRIBUTES='eduPersonScopedAffiliation'
#export DJANGO_SAML_GROUP_ATTRIBUTES='eduPersonScopedAffiliation'
+export GRAPHITE_HOST='localhost'
+export GRAPHITE_PORT='8081'
export GRAPHITE_HOST='{{ pillar['graphite']['host'] }}'
-export GRAPHITE_PORT='{{ pillar['graphite']['port'] }}'
+export GRAPHITE_AMQP_PORT='{{ pillar['graphite']['port'] }}'
export GRAPHITE_AMQP_USER='{{ pillar['graphite']['user'] }}'
export GRAPHITE_AMQP_PASSWORD='{{ pillar['graphite']['password'] }}'
export GRAPHITE_AMQP_QUEUE='{{ pillar['graphite']['queue'] }}'
--
libgit2 0.26.0