Fix graphite services

salt/graphite/files/graphite-carbon.service

@@ -7,7 +7,7 @@ User={{ pillar['graphite']['user'] }}
 Group={{ pillar['graphite']['user'] }}
 Environment=PYTHONPATH=/opt/graphite/lib GRAPHITE_ROOT=/opt/graphite
 WorkingDirectory=/opt/graphite/bin/
-ExecStart=/bin/bash -c "source /etc/profile; workon graphite; exec twistd --nodaemon --reactor=epoll --no_save carbon-cache"
+ExecStart=/bin/bash -c "source /opt/graphite/bin/activate; exec twistd --nodaemon --reactor=epoll --no_save carbon-cache"
 Restart=always
 
 [Install]

salt/graphite/files/graphite.service

@@ -6,7 +6,7 @@ After=network.target
 User={{ pillar['graphite']['user'] }}
 Group={{ pillar['graphite']['user'] }}
 WorkingDirectory=/opt/graphite/webapp/graphite
-ExecStart=/bin/bash -c "source /etc/profile; source /opt/graphite/bin/activate; PYTHONPATH="/opt/graphite/lib/:/opt/graphite/webapp/" exec django-admin.py runserver [::]:8081 --settings=graphite.settings"
+ExecStart=/bin/bash -c "source /opt/graphite/bin/activate; PYTHONPATH=/opt/graphite/lib/:/opt/graphite/webapp/ exec django-admin.py runserver [::]:8080 --settings=graphite.settings"
 Restart=always
 
 [Install]