Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Permalink
fix(router): change nginx directory to /opt/nginx.
Browse files Browse the repository at this point in the history
  • Loading branch information
aledbf committed Oct 3, 2014
1 parent ccffb4f commit 0b6635b
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion router/Dockerfile
Expand Up @@ -21,6 +21,6 @@ CMD ["/app/bin/boot"]

ADD . /app

ADD nginx.tgz /nginx
ADD nginx.tgz /opt/nginx

RUN rm nginx.tgz
2 changes: 1 addition & 1 deletion router/bin/boot
Expand Up @@ -47,7 +47,7 @@ etcd_set_default gzipTypes "application/x-javascript application/xhtml+xml appli

# spawn the service in the background
echo "Starting Nginx..."
/nginx/sbin/nginx &
/opt/nginx/sbin/nginx &
SERVICE_PID=$!

# smart shutdown on SIGINT and SIGTERM
Expand Down
2 changes: 1 addition & 1 deletion router/bin/check
Expand Up @@ -7,6 +7,6 @@ if grep -q "<no value>" $1 ; then
exit 1
fi

if ! /nginx/sbin/nginx -t -c $1 ; then
if ! /opt/nginx/sbin/nginx -t -c $1 ; then
exit 1
fi
4 changes: 2 additions & 2 deletions router/conf.d/nginx.conf.toml
@@ -1,6 +1,6 @@
[template]
src = "nginx.conf"
dest = "/nginx/conf/nginx.conf"
dest = "/opt/nginx/conf/nginx.conf"
uid = 0
gid = 0
mode = "0644"
Expand All @@ -12,4 +12,4 @@ keys = [
"/deis/builder",
]
check_cmd = "/app/bin/check {{ .src }}"
reload_cmd = "/nginx/sbin/nginx -s reload"
reload_cmd = "/opt/nginx/sbin/nginx -s reload"
2 changes: 1 addition & 1 deletion router/parent/Dockerfile
Expand Up @@ -4,4 +4,4 @@ ADD . /tmp

RUN /tmp/build.sh

RUN tar -C /nginx -czf /nginx.tgz .
RUN tar -C /opt/nginx -czf /nginx.tgz .
2 changes: 1 addition & 1 deletion router/parent/build.sh
Expand Up @@ -6,7 +6,7 @@ export VERSION_TCP_PROXY=0.4.5
export BUILD_PATH=/tmp/build

# nginx installation directory
export PREFIX=/nginx
export PREFIX=/opt/nginx

rm -rf $PREFIX
mkdir $PREFIX
Expand Down
2 changes: 1 addition & 1 deletion router/templates/nginx.conf
Expand Up @@ -19,7 +19,7 @@ http {
types_hash_max_size 2048;
server_names_hash_bucket_size 64;

include /nginx/conf/mime.types;
include /opt/nginx/conf/mime.types;
default_type application/octet-stream;
{{ if .deis_router_gzip }}
gzip {{ .deis_router_gzip }};
Expand Down

0 comments on commit 0b6635b

Please sign in to comment.