diff --git a/README.md b/README.md index 3c00a5e4f12f3dc7c0348eafabce5b01beeb2b3c..9908e5f0e745361be37f0ff0d349144abb014f5a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ Opertes in two modes, `proxy` and `redirect See also `docker-compose.yml` file. - #### General Options The following engiernment variables can be set in any mode. @@ -61,9 +60,9 @@ docker-compose up -d With `docker` ```bash -docker run -e SERVER_REDIRECT=www.example.com -p 8888:80 schmunk42/nginx-redirect -docker run -e SERVER_REDIRECT=www.example.com -e SERVER_REDIRECT_PATH=/landingpage -p 8888:80 schmunk42/nginx-redirect -docker run -e SERVER_REDIRECT=www.example.com -e SERVER_REDIRECT_PATH=/landingpage -e SERVER_REDIRECT_SCHEME=https -p 8888:80 schmunk42/nginx-redirect +docker run -e SERVER_REDIRECT=www.example.com -p 8888:80 qotoorg/nginx-redirect +docker run -e SERVER_REDIRECT=www.example.com -e SERVER_REDIRECT_PATH=/landingpage -p 8888:80 qotoorg/nginx-redirect +docker run -e SERVER_REDIRECT=www.example.com -e SERVER_REDIRECT_PATH=/landingpage -e SERVER_REDIRECT_SCHEME=https -p 8888:80 qotoorg/nginx-redirect ``` ## Resources diff --git a/docker-compose.yml b/docker-compose.yml index 5077eccdde5bf46d4203b5d8305a5bf02796a86a..947d2b306dfc3b4ae4d9f4a6be8a457f309ed30c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,12 @@ nginx-redirect: - image: qoto/nginx-redirect - build: . + image: qotoorg/nginx-redirect ports: - - "8888:80" + - "80" environment: - - SERVER_REDIRECT=www.example.com + - "SERVER_NAME=swarmpit.qoto.org" + - "PROXY_HOST=internal.swarm.qoto.org" + - "PROXY_PORT=888" + #- SERVER_REDIRECT=www.example.com # optionally define path to redirect all requests # if not set nginx var $request_uri is used #- SERVER_REDIRECT_PATH=/landingpage diff --git a/run.sh b/run.sh index cc63523f04d8fe86cb41f27ef8fcc324f9ca3f8b..aeadc7907849d8e09f68a62087b0b741bfb5b8dc 100644 --- a/run.sh +++ b/run.sh @@ -30,7 +30,7 @@ if [ -n "$PROXY_HOST" ] ; then sed -i '/^##START_SSL_SERVER##/,/^##END_SSL_SERVER##/{/^##START_SSL_SERVER##/!{/^##END_SSL_SERVER##/!d}}' /etc/nginx/conf.d/default.conf sed -i 's/^##[^#]*##$//g' /etc/nginx/conf.d/default.conf else - else lets just remove the comment blocks and make it pretty. + #else lets just remove the comment blocks and make it pretty. sed -i 's/^##[^#]*##$//g' /etc/nginx/conf.d/default.conf fi