summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--debian/rhrdtime.service1
-rw-r--r--src/helsinki.at/rhrdtime/rhrdtime.go2
3 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 96167f5..b1a116a 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ GOCMD := go
getlibs: export GOPATH=$(curdir)
getlibs:
- $(GOCMD) get "github.com/codegangsta/martini"
+ $(GOCMD) get "github.com/go-martini/martini"
$(GOCMD) get "github.com/gorilla/websocket"
$(GOCMD) get "github.com/tuxychandru/pubsub"
diff --git a/debian/rhrdtime.service b/debian/rhrdtime.service
index 0d4658e..bfffdee 100644
--- a/debian/rhrdtime.service
+++ b/debian/rhrdtime.service
@@ -4,6 +4,7 @@ Description=Radio Helsinki Rivendell Time Websocket Server
[Service]
User=rhrdtime
Group=rhrdtime
+Environment="MARTINI_ENV=production"
ExecStart=/usr/bin/rhrdtime
Restart=always
RestartSec=1s
diff --git a/src/helsinki.at/rhrdtime/rhrdtime.go b/src/helsinki.at/rhrdtime/rhrdtime.go
index 692882b..6677e97 100644
--- a/src/helsinki.at/rhrdtime/rhrdtime.go
+++ b/src/helsinki.at/rhrdtime/rhrdtime.go
@@ -32,7 +32,7 @@ import (
"net/http"
"encoding/json"
- "github.com/codegangsta/martini"
+ "github.com/go-martini/martini"
"github.com/gorilla/websocket"
"github.com/tuxychandru/pubsub"
)