summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-04-07 08:47:14 +0200
committerAndreas Maunz <andreas@maunz.de>2011-04-07 08:47:14 +0200
commit721feafdb56c18fb7424d505377abe80d78f4e7b (patch)
tree4432d4a80bbf49b34d4cdcab4468adfe36fd0d7d
parente8dc762a04a5559392ec6fa8bdd055bd6557acc7 (diff)
Nginx Dest Conf fixed
-rw-r--r--nginx.conf3
-rwxr-xr-xnginx.sh2
2 files changed, 2 insertions, 3 deletions
diff --git a/nginx.conf b/nginx.conf
index 8ce1591..a8a2b55 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -8,7 +8,6 @@ events {
http {
server_names_hash_bucket_size 256;
- include /home/ist/nginx/conf/mime.types;
passenger_root RUBY_DEST/lib/ruby/gems/1.8/gems/PASSENGER;
passenger_ruby RUBY_DEST/bin/ruby;
@@ -17,7 +16,7 @@ http {
passenger_spawn_method conservative;
#passenger_use_global_queue on;
- include NGINX_DEST/mime.types;
+ include NGINX_DEST/conf/mime.types;
default_type application/octet-stream;
sendfile on;
diff --git a/nginx.sh b/nginx.sh
index 3aefac0..6fb14dc 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -41,7 +41,7 @@ if ! $NGINX_DONE; then
passenger=`ls -d passenger*`;
cd - >>$LOG 2>&1
servername=`hostname`
- sed -e "s/PASSENGER/$passenger/;s/SERVERNAME/$servername/;s/RUBY_DEST/$RUBY_DEST/" ./nginx.conf > $NGINX_DEST/nginx.conf 2>>$LOG
+ sed -e "s/PASSENGER/$passenger/;s/SERVERNAME/$servername/;s/RUBY_DEST/$RUBY_DEST/;s/NGINX_DEST/$NGINX_DEST/" ./nginx.conf > $NGINX_DEST/nginx.conf 2>>$LOG
fi
cd "$DIR"