From 11eb81316492b9710f18358c0abdfd72d36f793f Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Sun, 8 Dec 2013 19:19:51 +0100
Subject: [PATCH] Installation steps and bugfixes

---
 ccollectd/ccollectd                 | 1 +
 ccollectd/config.yaml.example       | 1 +
 cstatsd/config/cstatsd.yaml.example | 2 +-
 deps.sh                             | 2 +-
 install-steps.txt                   | 2 ++
 5 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 install-steps.txt

diff --git a/ccollectd/ccollectd b/ccollectd/ccollectd
index 51acdf6..f5fd4f8 100755
--- a/ccollectd/ccollectd
+++ b/ccollectd/ccollectd
@@ -46,6 +46,7 @@ def heartbeat():
 			
 		last_node_status[hostname] = up
 		
+		send_message = False
 		if status_changed:
 			if up:
 				msg_type = "up"
diff --git a/ccollectd/config.yaml.example b/ccollectd/config.yaml.example
index da3d140..a4c2b87 100644
--- a/ccollectd/config.yaml.example
+++ b/ccollectd/config.yaml.example
@@ -3,6 +3,7 @@ hostname: monitoring.cryto.net
 heartbeat:
         interval: 5
         timeout: 1
+        attempts: 3
 
 nodes:
         localhost:
diff --git a/cstatsd/config/cstatsd.yaml.example b/cstatsd/config/cstatsd.yaml.example
index 7dba2ef..ccf1372 100644
--- a/cstatsd/config/cstatsd.yaml.example
+++ b/cstatsd/config/cstatsd.yaml.example
@@ -4,4 +4,4 @@ pubkey: a266a0634790a79c6934385892f7c377d35b8f03b9c6ac7d5bfed4a94f93ba65
 autostart:
         - stats-processes
         - stats-ports
-        - stats-machines
+        - stats-machine
diff --git a/deps.sh b/deps.sh
index 6f5ca12..2be7114 100755
--- a/deps.sh
+++ b/deps.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 # You need squeeze-backports if you run this on squeeze!
 apt-get install -y libzmq-dev libffi-dev
-pip install pyzmq msgpack-python pynacl pyyaml
+pip install pyzmq msgpack-python pynacl pyyaml psutil
diff --git a/install-steps.txt b/install-steps.txt
new file mode 100644
index 0000000..2401adc
--- /dev/null
+++ b/install-steps.txt
@@ -0,0 +1,2 @@
+apt-get install -y python python-dev && wget cryto.net/~joepie91/pipfix.sh && chmod +x pipfix.sh && ./pipfix.sh
+adduser --system --shell /bin/bash --group monitor && apt-get install -y git; su -c "cd ~; git clone https://github.com/joepie91/cryto-status.git" monitor && /home/monitor/cryto-status/deps.sh