mirror/ nginx-proxy
1
0
Fork 0
mirror of https://github.com/nginx-proxy/nginx-proxy synced 2024-05-26 01:16:20 +02:00
Code Issues
766 Commits 9 Branches 30 Tags 23 MiB
Commit Graph

203 Commits

Author SHA1 Message Date
Steve Kamerman f186815c2d Merged upstream 2017-01-11 22:42:35 -05:00
Matthias Döring 8dfe5ae384 Add info about alpine base image 
For todo in #558
 2017-01-11 16:57:37 +01:00
Konstantin L 16c9853dc2 Set appropriate X-Forwarded-Ssl header. 2017-01-10 15:44:02 +01:00
Jason Wilder e9a5519fb0 Merge pull request #611 from MichaelSp/patch-1 
add link to letsencrypt-nginx-proxy-companion
 2016-12-30 15:26:40 -07:00
Matthias Döring 004cc3cb8c Upgrade to nginx 1.11.8 2016-12-28 23:38:47 +01:00
Cody Ramaker b66398d1bf Updated nginx to 1.11.6 2016-12-08 13:24:49 -06:00
Steve Kamerman fc7653bf3d Merge branch 'master' into feature_nohttps 2016-12-05 09:06:39 -05:00
Jason Wilder e60fefad27 Merge pull request #587 from kamermans/feature_x_forwarded_port 
Added X-Forwarded-Port and proxy headers tests
 2016-12-02 11:17:44 -07:00
Max Wilkinson fddae94ed8 Clarified a couple parts in the README 2016-10-28 14:46:37 -04:00
Michael 1a608eaefb add link to letsencrypt-nginx-proxy-companion 2016-10-22 14:31:57 +02:00
Steve Kamerman 8cf0b75d80 Updated README with HTTPS_METHOD=nohttps 2016-10-01 11:25:11 -04:00
Steve Kamerman c091d08fee Updated docs for issue #562 2016-09-29 22:24:06 -04:00
Steve Kamerman ebbf7a7b74 Expanded documentation in SSL/TLS support 2016-09-29 21:57:28 -04:00
Steve Kamerman 0b1e9e56e1 Issue #535 Added default 2048-bit dhparam.pem file 2016-09-29 16:48:18 -04:00
Steve Kamerman 7422539f20 Updated README to reflect X-Forwarded-Port 2016-09-29 15:42:49 -04:00
Steve Kamerman 6ebbdb10c7 Merge branch 'master' into feature_x_forwarded_port 2016-09-29 11:26:51 -04:00
Jason Wilder 40d433ae80 Merge pull request #493 from ryneeverett/docker_compose_separate_containers 
Add docker-compose file for separate containers.
 2016-09-09 14:18:06 -06:00
Jason Wilder ec7169c112 Merge pull request #323 from pabra/master 
connect to uWSGI backends
 2016-09-09 14:16:08 -06:00
hwang 03e863d838 upgrade nginx to 1.11.3 2016-08-25 20:16:37 +02:00
hwang 86c408bbdd upgrade nginx to 1.11.0 2016-07-29 21:17:14 +02:00
Steve Kamerman 2e29168d92 Added X-Forwarded-Port 2016-07-21 11:23:35 -04:00
Steve Kamerman fd127517b9 Added comments about httpoxy 2016-07-19 11:03:41 -04:00
Steve Kamerman 357d58ad97 Mitigate httpoxy attack (httpoxy.org, CVE-2016-(5385-5388,1000109-1000110) 2016-07-18 13:34:37 -04:00
ryneeverett 5f684d4fc5 Add docker-compose file for separate containers. 
Demonstrate that this pattern works.

This is based on the example at
<https://github.com/fatk/docker-letsencrypt-nginx-proxy-companion-examples/blob/master/docker-compose/v2/simple-site/docker-compose.yml>.
 2016-07-13 17:31:53 -04:00
Jason Wilder c36b42933d Merge pull request #462 from kamermans/master 
Disable HSTS when HTTPS_METHOD=noredirect
 2016-06-12 15:28:08 -06:00
Jason Wilder a0dee5c833 Remove -only-exposed from separate container instructions 2016-06-12 15:25:32 -06:00
Jason Wilder fdf93cafba Add docker-compose.yml v2 example 2016-06-12 14:10:46 -06:00
Jason Wilder adf4573de4 Remove Circle CI badge 2016-06-12 10:45:59 -06:00
Jason Wilder 9b0138f944 Remove docker compose v2 notes 2016-06-10 20:11:58 -06:00
Jason Wilder c256f31728 Update nginx 1.9.15 2016-06-10 20:08:10 -06:00
Steve Kamerman da3e257843 Removed HSTS when HTTPS_METHOD=noredirect, added tests, improved docs wrt HSTS 2016-05-19 23:20:43 -04:00
Steve Kamerman 3d77979efb Expanded documentation on HTTPS_METHOD 2016-05-19 23:16:19 -04:00
Jason Wilder 5b9264d945 Merge pull request #298 from kamermans/master 
Added env var to disable SSL redirect
 2016-05-01 17:45:45 -06:00
Jason Wilder 1c98df2de4 Merge pull request #337 from baptistedonaux/master 
Support Overlay Network
 2016-05-01 17:35:48 -06:00
Jason Wilder a72c7e6e20 Add docker hub badges 2016-04-22 09:56:21 -06:00
Steve Kamerman f294582ae8 Merge branch 'master' of https://github.com/jwilder/nginx-proxy 2016-04-20 11:05:20 -04:00
Baptiste Donaux f66934567e Merge remote-tracking branch 'upstream/master' 2016-04-05 09:22:31 +02:00
Jason Wilder 30e2da01e9 Add travis.yml 
From #312
 2016-04-04 17:18:05 -06:00
Baptiste Donaux 74fb2acc4b Merge remote-tracking branch 'upstream/master' 2016-03-23 08:52:58 +01:00
Mike Rohland 1f8b480365 moved nginx to 1.9.12 2016-03-21 22:47:01 +01:00
Steve Kamerman 9671e0c1a2 Merge branch 'master' of https://github.com/jwilder/nginx-proxy 2016-03-18 13:47:11 -04:00
Gabriel Baker d849e5f5d0 Linkify the issue ref 2016-02-23 07:25:32 +00:00
Gabriel Baker 8c6ec27547 Mention the docker-compose issues 2016-02-23 07:23:27 +00:00
Mike Dillon 5c828cb50a Update README wording for overlay networking 2016-01-20 23:30:55 -08:00
Baptiste Donaux 2eb977589c Complete documentation 2016-01-20 08:54:57 +01:00
Baptiste Donaux 13bb99c4d2 Update README - Nginx proxy must use host network to support overlay network 2016-01-17 12:35:29 +01:00
pabra 51c219d651 connect to uWSGI backends 2015-12-22 21:20:44 +01:00
Steve Kamerman 4a95d84d0d Trying to trigger CI 2015-12-02 21:46:05 -05:00
Steve Kamerman 58fc298dea Semantic change to trigger CI rebuild 2015-12-02 00:29:32 -05:00
Steve Kamerman 4bf7f888d0 Documented HTTPS_METHOD 2015-11-20 17:47:08 -05:00
Travis Dart 8225015c85 Typo fix. 2015-10-30 15:48:01 -05:00
Mike Dillon 5404938797 Update to nginx 1.9.6 2015-10-28 21:29:39 -07:00
Jason Wilder e09550febb Add Makefile 
Make it easier to run tests.
 2015-10-14 10:29:22 -06:00
Thomas LÉVEIL 99560da65c fix CircleCI badge link 2015-10-09 15:33:29 +02:00
Jason Wilder 495b0ad8b6 Add circleci build status badge 2015-10-08 22:08:04 -06:00
Aleš Roubíček d46d9ad943 Use nginx 1.9.5 badge in readme 2015-09-23 17:49:51 +02:00
Jason Wilder 8c193ba7e1 Merge pull request #215 from gradecam/feature/customize_improvements 
customizability improvements
 2015-09-12 15:23:53 -06:00
Mike Dillon e5ad1ecfd1 Remove boot2docker-specific instructions 
Both boot2docker and docker-machine will work fine with the normal `docker run`
command used in the rest of the docs.
 2015-08-24 19:37:45 -07:00
Mike Dillon 682914dec7 Document the need to EXPOSE the proxied port 2015-08-23 18:41:30 -07:00
Rich 235528338c fix 2 minor English language typos 2015-08-19 23:52:54 -04:00
Richard Bateman 5089bf77dd Update wording in docs as per pull request feedback 2015-08-14 12:34:10 -06:00
Richard Bateman 66711ff026 Add warning about consequences of incorrectly using proxy_config.conf 2015-08-14 12:26:19 -06:00
Richard Bateman d9ee7ed704 Add support for adding options to the location block of a vhost 2015-08-14 12:26:19 -06:00
Richard Bateman b131b00e19 Add support for vhosts.d/defaults file with default vhost options 
- Only used if it exists and a vhost-specific one doesn't
 2015-08-14 12:26:19 -06:00
Richard Bateman d07a7d7487 Fix example command in docs 2015-08-14 12:26:19 -06:00
Richard Bateman 2eff96969a Add support for overriding default proxy settings 
- If /etc/nginx/proxy.conf exists use that, otherwise use the default
 2015-08-14 12:26:07 -06:00
Jason Wilder e1c685b679 Update boot2docker instructions 2015-07-20 10:05:01 -06:00
Jason Wilder abb42bbc52 Update nginx badge to 1.9.2 2015-07-16 16:55:54 -06:00
Russ Ferriday dece1e8ef4 Trivial text improvements 2015-07-07 11:07:45 +01:00
Ryan Trauntvein 6719f7636f Encourage using read-only mount for docker.sock 2015-06-05 10:24:45 -07:00
Kuo-Cheng Yeu d74a4146c8 fix indention, and file nameing 2015-05-21 23:43:09 +08:00
Kuo-Cheng Yeu da0191a778 add 'Diffie-Hellman Groups' section in README.md 2015-05-21 15:37:19 +08:00
Brian Prodoehl 3954774d65 Fix a couple things in the README. 2015-05-19 16:16:50 -04:00
Jason Wilder 503072c03f Merge pull request #72 from BenHall/default_host 
Ability to set a default host for nginx
 2015-05-14 10:00:04 -06:00
Mike Dillon 94fd06b98c Update README.md to refer to nginx 1.9.0 2015-05-02 15:57:48 -07:00
Tobias Munk ce3f1fa7ca show command on multiple lines, increased readability 2015-04-09 22:08:59 +02:00
David Wisner e4a5d9a510 update 2015-03-31 21:28:02 -07:00
Mike Dillon 927e583f6a Document custom config for multi-host VIRTUAL_HOST 2015-02-22 11:19:33 -08:00
Mike Dillon c4b3955ab9 Fix typo; shorten example conf file name 2015-02-22 10:02:13 -08:00
Mike Dillon d4d9755a42 Document custom Nginx configuration in README.md 2015-02-22 09:50:19 -08:00
Mike Dillon 3f199d56c1 Add VIRTUAL_PROTO to README.md 2015-02-14 16:19:27 -08:00
Jason Wilder 93ee4acb23 Fix grammar 2015-02-03 14:55:14 -07:00
Jason Wilder 71a17c127f Update SSL doc grammar 2015-01-29 09:42:58 -07:00
Tobias Munk 134e037d48 added wildcard hosts, fixes #89 2015-01-22 02:46:51 +01:00
Jason Wilder 450ecf23ed Add nginx/license badges 2015-01-14 09:51:21 -07:00
Ben Hall 30a53fb60a Ability to set a default host for nginx 2014-12-24 12:21:40 +00:00
Albert Murillo Aguirre 6d646d92f8 Basic Authentication Support 2014-12-19 16:26:42 -07:00
Jason Wilder 56b4a2e182 Fix README grammar 2014-12-15 12:30:58 -07:00
Jason Wilder 080a5157e6 Remove OCSP stapling 
Looks like it was not actually working before and failing silently
because ssl_trusted_certificate was not specified.  Will need to
revisit implementing this functionality so removing it for now
to prevent the warnings logged by nginx now.
 2014-12-03 11:06:11 -07:00
Jason Wilder 35b81f5092 Fix separate containers instructions 2014-12-02 16:17:58 -07:00
Jason Wilder 50839742f2 Grammar/formatting 2014-12-02 14:43:50 -07:00
Jason Wilder 51c5c172ee Update README w/ SSL docs 2014-11-27 12:49:44 -07:00
Eric Betts f117bfa5f3 Typo in readme 2014-11-15 20:47:38 -08:00
Anthony Mayfield 1699879271 Update README.md 
Fix typo
 2014-10-21 20:39:34 -06:00
Jason Wilder b71c45abc0 Fix command line usage 2014-10-21 18:29:31 -06:00
Jason Wilder e0bf18f041 Add separate container instructions 
Fixes #34
Fixes #5
 2014-10-21 18:21:05 -06:00
Frank Lemanschik ac5738dacd Updated Readme Syntax 2014-09-05 01:34:49 +02:00
Jason Wilder 34afde73e0 Document multiple host support 2014-08-19 09:42:43 -06:00
Jason Wilder a794d6db46 Remove embedded Dockerfile contents 
It's added by index.docker.io automatically.
 2014-05-20 09:40:38 -06:00
Jason Wilder 5caec4895e Update docs for VIRTUAL_PORT 2014-05-20 09:39:08 -06:00
Jason Wilder 435a8ba30a Fix typo 2014-05-05 14:15:18 -06:00
Jason Wilder 5623ca7b92 Updated instructions 2014-05-05 14:13:51 -06:00
Jason Wilder 843a07cff7 Initial commit 2014-05-05 10:01:40 -07:00