fixes
diff --git a/README.md b/README.md
index dc375ea..ab3e79a 100755
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@
## Sample pillar
+### Standalone statsd server
+
statsd:
server:
enabled: true
@@ -13,30 +15,7 @@
- type: graphite
host: metrics1.domain.com
port: 2003
-
-## Sample setup
-
-supervisor:
- server:
- enabled: true
- services:
- - name: statsd_service
- type: statsd
-nodejs:
- environment:
- enabled: true
-statsd:
- server:
- enabled: true
- bind:
- port: 8125
- address: 0.0.0.0
- backends:
- - type: graphite
- host: metrics1.domain.com
- port: 2003
-
## Read more
* https://github.com/etsy/statsd/
diff --git a/conf/init b/conf/init
index b7b7320..cafbe1f 100644
--- a/conf/init
+++ b/conf/init
@@ -22,7 +22,7 @@
DESC="StatsD"
NAME=statsd
DAEMON=$NODE_BIN
-DAEMON_ARGS="/srv/statsd/stats.js /etc/statsd/localConfig.js 2>&1 >> /var/log/statsd/statsd.log "
+DAEMON_ARGS="/srv/statsd/statsd/stats.js /etc/statsd/localConfig.js 2>&1 >> /var/log/statsd/statsd.log "
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
CHDIR="/srv/statsd"
diff --git a/server.sls b/server.sls
index bac494b..743898d 100755
--- a/server.sls
+++ b/server.sls
@@ -4,12 +4,6 @@
- nodejs
- git
-statsd_packages:
- pkg:
- - installed
- - names:
- - nodejs
-
statsd_user:
user.present:
- name: statsd
@@ -17,21 +11,24 @@
- home: /srv/statsd
- require:
- git: https://github.com/etsy/statsd.git
+ - pkg: nodejs_packages
https://github.com/etsy/statsd.git:
git.latest:
- target: /srv/statsd/statsd
+ - require:
+ - pkg: git_packages
+{% if grains.os_family == "Debian" %}
/etc/init.d/statsd:
- file:
- - managed
+ file.managed:
- source: salt://statsd/conf/init
- user: root
- group: root
- mode: 744
- template: jinja
-{#
+
statsd:
service.running:
- enable: true
@@ -39,10 +36,11 @@
- file: /etc/init.d/statsd
- watch:
- file: /etc/statsd/localConfig.js
-#}
+
+{% endif %}
+
/etc/statsd/localConfig.js:
- file:
- - managed
+ file.managed:
- source: salt://statsd/conf/localConfig.js
- user: root
- group: root
@@ -50,8 +48,7 @@
- template: jinja
/var/log/statsd:
- file:
- - directory
+ file.directory:
- user: statsd
- group: statsd
- mode: 777
@@ -61,6 +58,7 @@
{%- for backend in pillar.statsd.server.backends %}
{%- if backend.type == 'amqp' %}
+
#statsd_amqp_package:
# npm.installed:
# - name: statsd-amqp-backend