2 files changed, 4 insertions, 4 deletions
diff --git a/nginx.conf b/nginx.conf
index ce00e37..e6cb438 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -8,8 +8,8 @@ http {
 
     server_names_hash_bucket_size  256;
 
-    passenger_root /opt/ruby-enterprise-1.8.7-2010.03/lib/ruby/gems/1.8/gems/PASSENGER;
-    passenger_ruby /opt/ruby-enterprise-1.8.7-2010.03/bin/ruby;
+    passenger_root RUBY_DEST/lib/ruby/gems/1.8/gems/PASSENGER;
+    passenger_ruby RUBY_DEST/bin/ruby;
     passenger_default_user opentox;
     passenger_log_level 2;
     passenger_spawn_method conservative;
diff --git a/nginx.sh b/nginx.sh
index 779a06f..5cd4853 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -41,8 +41,8 @@ if ! $NGINX_DONE; then
   cd "$RUBY_DEST/lib/ruby/gems/1.8/gems/"
   passenger=`ls -d passenger*`;
   cd -
-  servername=`hostname`.`dnsdomainname`
-  sed -e "s/PASSENGER/$passenger/;s/SERVERNAME/$servername/" ./nginx.conf > $NGINX_DEST/nginx.conf
+  servername=`hostname`
+  sed -e "s/PASSENGER/$passenger/;s/SERVERNAME/$servername/;s/RUBY_DEST/$RUBY_DEST/" ./nginx.conf > $NGINX_DEST/nginx.conf
 fi
 
 cd "$DIR"