From 36c6e73871c0cc81957e182ab74b187fe23d7804 Mon Sep 17 00:00:00 2001 From: Florian Heinemann Date: Wed, 5 Nov 2014 09:36:38 -0500 Subject: [PATCH] Remove start.sh --- bin/release | 2 +- bin/start.sh | 2 -- conf/{nginx.conf.erb => nginx.conf} | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 bin/start.sh rename conf/{nginx.conf.erb => nginx.conf} (74%) diff --git a/bin/release b/bin/release index a603236..0f00929 100755 --- a/bin/release +++ b/bin/release @@ -4,5 +4,5 @@ set -e cat << EOF --- default_process_types: - web: sh start.sh + web: echo 's//{${PORT}}/g' && sed -i 's//{${PORT}}/g' /app/nxinx.conf && /app/nginx/nginx -c /app/nginx.conf EOF diff --git a/bin/start.sh b/bin/start.sh deleted file mode 100644 index 7846bf4..0000000 --- a/bin/start.sh +++ /dev/null @@ -1,2 +0,0 @@ -erb /app/nginx.conf.erb > /app/nginx.conf -/app/nginx/nginx -c /app/nginx.conf \ No newline at end of file diff --git a/conf/nginx.conf.erb b/conf/nginx.conf similarity index 74% rename from conf/nginx.conf.erb rename to conf/nginx.conf index 5417ff6..7b2b070 100644 --- a/conf/nginx.conf.erb +++ b/conf/nginx.conf @@ -11,9 +11,9 @@ http { types_hash_max_size 2048; include mime.types; server { - listen <%= ENV['PORT'] %>; + listen ; server_name _; - root <%= ENV.fetch('root', '/app/www') %>; + root /app/www; index index.html; } }