summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-06-06 12:32:52 +0200
committerAndreas Maunz <andreas@maunz.de>2011-06-06 12:32:52 +0200
commit4e84079b180d6ac7dd1b752895ba7065521a116b (patch)
treeb80299737ca4c105d765052adafd0d65b10b23dc
parent3351cf220073a45b6c8d295a4985ce8e30415160 (diff)
Fixing user
-rw-r--r--nginx.conf2
-rwxr-xr-xnginx.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/nginx.conf b/nginx.conf
index d3a8324..c89efe2 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -10,7 +10,7 @@ http {
passenger_root RUBY_DEST/lib/ruby/gems/1.8/gems/PASSENGER;
passenger_ruby RUBY_DEST/bin/ruby;
- passenger_default_user opentox;
+ passenger_default_user USER;
passenger_log_level 2;
passenger_spawn_method conservative;
#passenger_use_global_queue on;
diff --git a/nginx.sh b/nginx.sh
index 6b10a5c..800165e 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -52,6 +52,7 @@ cd - >>$LOG 2>&1
servername=`hostname`
$GIT checkout nginx.conf>>$LOG 2>&1
cmd="sed -i -e \"s,PASSENGER,$passenger,;s,SERVERNAME,$servername,;s,RUBY_DEST,$RUBY_DEST,;s,NGINX_DEST,$NGINX_DEST,;s,WWW_DEST,$WWW_DEST,\" ./nginx.conf" && run_cmd "$cmd" "Config"
+cmd="sed -i -e \"s,USER,`whoami`,\" ./nginx.conf" && run_cmd "$cmd" "User"
cmd="cp ./nginx.conf \"$NGINX_DEST/conf\"" && run_cmd "$cmd" "Copy"
if [ ! -f $NGINX_CONF ]; then