Author: Karsten Loesing <karsten.loes...@gmx.net>
Date: Thu, 21 Oct 2010 14:59:40 +0200
Subject: Update paths in rserve files.
Commit: a0c5048114dbcff66e489c0f6dbcbe823d92dcbc
---
rserve/Rserv.conf | 5 +----
rserve/rserve-init.R | 2 +-
rserve/start.sh | 10 +---------
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/rserve/Rserv.conf b/rserve/Rserv.conf
index c6f6853..a23af49 100644
--- a/rserve/Rserv.conf
+++ b/rserve/Rserv.conf
@@ -1,5 +1,2 @@
-workdir /tmp/Rserv
-gid 1012 #CHANGE THIS
-uid 1011 #CHANGE THIS
-
+workdir /srv/metrics.torproject.org/web/rserve/workdir
source rserve-init.R
diff --git a/rserve/rserve-init.R b/rserve/rserve-init.R
index 79e9a75..a625500 100644
--- a/rserve/rserve-init.R
+++ b/rserve/rserve-init.R
@@ -10,7 +10,7 @@ library("plyr")
library("digest")
db = "tordir"
-dbuser = "ernie"
+dbuser = "metrics"
dbpassword= ""
source('graphs.R')
diff --git a/rserve/start.sh b/rserve/start.sh
index c3b4c71..403b298 100755
--- a/rserve/start.sh
+++ b/rserve/start.sh
@@ -1,11 +1,3 @@
#!/bin/sh
-
-###########################################################
-# NOTE #
-# RUN THIS AS ROOT - Rserve will run as user rserve #
-###########################################################
-
-#Output stderr and stdout to rserve log.
-
dir=`pwd`
-R CMD Rserve --RS-conf $dir/Rserv.conf >> ../rserve.log 2>&1
+R CMD
/home/metrics/R/x86_64-pc-linux-gnu-library/2.11/Rserve/libs/Rserve-bin.so
--RS-conf $dir/Rserv.conf >> rserve.log 2>&1
--
1.7.1
