From dd3ac20c6d4214008a6b1315566af7bbdcd2c51d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 20 Sep 2016 01:38:50 -0600 Subject: [PATCH] Switch template to app-nginx.conf.sigil --- README.md | 2 +- bin/compile | 10 +++++----- conf/{nginx.conf.sigil => app-nginx.conf.sigil} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename conf/{nginx.conf.sigil => app-nginx.conf.sigil} (100%) diff --git a/README.md b/README.md index 598bd4d..0ba2422 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ heroku buildpacks:set https://github.com/dokku/buildpack-nginx.git You can override the nginx root via setting the `NGINX_ROOT` environment variable. This should be a relative path in your repository. -You may completely override the built-in nginx config by placing an `nginx.conf.sigil` file in the root, modeled after our own [`conf/nginx.config.sigil`](https://github.com/dokku/buildpack-nginx/blob/master/conf/nginx.conf.sigil). This will be used inside of the container, and not by the host Dokku instance. See the [sigil project](https://github.com/gliderlabs/sigil) for more information concerning the sigil format. +You may completely override the built-in nginx config by placing an `app-nginx.conf.sigil` file in the root, modeled after our own [`conf/app-nginx.conf.sigil`](https://github.com/dokku/buildpack-nginx/blob/master/conf/app-nginx.conf.sigil). This will be used inside of the container, and not by the host Dokku instance. See the [sigil project](https://github.com/gliderlabs/sigil) for more information concerning the sigil format. ## Credits and License diff --git a/bin/compile b/bin/compile index 18655a6..7f4b32e 100755 --- a/bin/compile +++ b/bin/compile @@ -141,7 +141,7 @@ cd "$CUR_DIR" # Add support for app-nginx.conf.sigil if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] ; then echo "-----> Using user provided app-nginx.conf.sigil" - cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/nginx.conf.sigil" + cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/app-nginx.conf.sigil" fi # Allow deprecated nginx.conf.erb @@ -151,8 +151,8 @@ if [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then # ...else, force default file else - echo "-----> Using default nginx.conf.sigil" - cp conf/nginx.conf.sigil "$BUILD_DIR/nginx/nginx.conf.sigil" + echo "-----> Using default app-nginx.conf.sigil" + cp conf/app-nginx.conf.sigil "$BUILD_DIR/nginx/app-nginx.conf.sigil" fi # build mime.types unless overridden by user @@ -169,8 +169,8 @@ fi cat <"$BUILD_DIR/start_nginx" #!/usr/bin/env bash rm -f /app/nginx/nginx.conf -if [[ -f /app/nginx/nginx.conf.sigil ]]; then - /app/sigil/sigil -f /app/nginx/nginx.conf.sigil NGINX_ROOT="\$NGINX_ROOT" PORT="\$PORT" | cat -s > /app/nginx/nginx.conf +if [[ -f /app/nginx/app-nginx.conf.sigil ]]; then + /app/sigil/sigil -f /app/nginx/app-nginx.conf.sigil NGINX_ROOT="\$NGINX_ROOT" PORT="\$PORT" | cat -s > /app/nginx/nginx.conf else erb /app/nginx/nginx.conf.erb > /app/nginx/nginx.conf fi diff --git a/conf/nginx.conf.sigil b/conf/app-nginx.conf.sigil similarity index 100% rename from conf/nginx.conf.sigil rename to conf/app-nginx.conf.sigil