Merge branch 'master' of https://bitbucket.org/ckolivas/ckpool

ckpool.conf

@@ -0,0 +1,22 @@
+{
+"btcd" :  [
+	{
+		"url" : "localhost:8332",
+		"auth" : "user",
+		"pass" : "pass"
+	},
+	{
+		"url" : "backup:8332",
+		"auth" : "user",
+		"pass" : "pass"
+	}
+],
+"btcaddress" : "15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ",
+"btcsig" : "/mined by ck/",
+"blockpoll" : 500,
+"update_interval" : 30,
+"serverurl" : "ckpool.org:3333",
+"mindiff" : 1,
+"startdiff" : 1,
+"logdir" : "logs"
+}

ckproxy.conf

@@ -0,0 +1,19 @@
+{
+"proxy" :  [
+	{
+		"url" : "ckpool.org:3333",
+		"auth" : "user",
+		"pass" : "pass"
+	},
+	{
+		"url" : "backup.ckpool.org:3333",
+		"auth" : "user",
+		"pass" : "pass"
+	}
+],
+"update_interval" : 30,
+"serverurl" : "192.168.1.100:3334",
+"mindiff" : 1,
+"startdiff" : 1,
+"logdir" : "logs"
+}