Merge branch 'release/1.0.10'

app.js

@@ -1,22 +1,16 @@
 import Server from "~/Server"
 import config from "config"
+import { Mongo } from "podcloud-stats"
 
-function constructFeedsAPIUrl() {
-  const host = config.get("hosts") && config.get("hosts").feeds
+const feeds_host = config.get("hosts") && config.get("hosts").feeds
 
-  return (
-    (host &&
-      (host.match(/^https?:\/\//) ? host : "http://" + host) + "/graphql") ||
-    null
-  )
-}
+const feedsAPIURL =
+  (feeds_host &&
+    (feeds_host.match(/^https?:\/\//) ? feeds_host : "http://" + feeds_host) +
+      "/graphql") ||
+  null
 
-const stats = config.get("stats")
-
-const server = new Server(
-  config.get("listen"),
-  constructFeedsAPIUrl(),
-  stats.private_key,
-  stats.bin
-)
-server.start()
+Mongo.connect(config.get("mongodb")).then(() => {
+  const server = new Server(config.get("listen"), feedsAPIURL)
+  server.start()
+}, console.error)

config/default.json

@@ -1,9 +1,6 @@
 {
   "listen": 8880,
-  "stats": {
-    "bin": "~/podcloud/stats/bin/stats",
-    "private_key": "~/podcloud/keys/rss.key"
-  },
+  "mongodb": "mongodb://localhost/podcloud_development",
   "hosts": {
     "podcasts": "lepodcast.test",
     "platform": "podcloud.test",

config/preprod.json

@@ -1,9 +1,6 @@
 {
   "listen": "/tmp/podcloud.rss.preprod.sock",
-  "stats": {
-    "bin": "/home/podcloud/preprod/stats/current/bin/stats",
-    "private_key": "/home/podcloud/preprod/rss/shared/keys/rss.key"
-  },
+  "mongodb": "mongodb://localhost/podcloud_beta",
   "hosts": {
     "podcasts": "pp.lepodcast.fr",
     "platform": "pp.podcloud.fr",

config/production.json

@@ -1,9 +1,6 @@
 {
   "listen": "/tmp/podcloud.rss.production.sock",
-  "stats": {
-    "bin": "/home/podcloud/production/stats/current/bin/stats",
-    "private_key": "/home/podcloud/production/rss/shared/keys/rss.key"
-  },
+  "mongodb": "mongodb://localhost/podcloud",
   "hosts": {
     "podcasts": "lepodcast.fr",
     "platform": "podcloud.fr",