505 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jason Wilder	32d42ffee7	Update docker-gen to 0.7.4	2018-01-14 15:28:46 -07:00
Jason Wilder	3fab237f34	Merge pull request #1022 from mouhamed/patch-1 ... Remove duplicate	2018-01-09 21:29:06 -07:00
mouhamed	1eac894902	Remove duplicate	2018-01-09 21:12:37 +01:00
Jason Wilder	73f29846b3	Merge pull request #957 from buchdag/ssl-modern ... Allow optional use of Mozilla modern SSL configuration	2017-12-06 16:34:30 -07:00
Nicolas Duchon	35f092ca30	Update doc with SSL_POLICY values	2017-11-18 09:18:55 +01:00
Nicolas Duchon	bf16afc665	Use enumerable SSL_POLICY instead of bool	2017-11-18 09:18:55 +01:00
Nicolas Duchon	ea80027525	Merge branch 'master' into ssl-modern	2017-11-16 22:47:25 +01:00
Jason Wilder	a6e8fae7f5	Merge pull request #970 from kamermans/bugfix/failing_ssl_tests ... Fixed failing SSL tests	2017-11-09 10:04:20 -07:00
Jason Wilder	9b8323d2e2	Merge pull request #969 from kamermans/feature/custom_hsts ... Added custom HSTS support (issue #953)	2017-11-09 08:47:37 -07:00
Steve Kamerman	612bf72ceb	Support old and new versions of requests	2017-11-08 23:19:13 -05:00
Steve Kamerman	ebd1485b09	Catch SSLError instead of CertificateError	2017-11-08 22:53:44 -05:00
Steve Kamerman	58a02f107e	Removed '-verify 0' - to disable verification, exclude -verify entirely	2017-11-08 22:42:52 -05:00
Steve Kamerman	a312472fb5	Added custom HSTS support (issue #953)	2017-11-08 22:30:24 -05:00
Jason Wilder	1374ee5b9e	Merge pull request #962 from cglewis/master ... MAINTAINER is deprecated, using LABEL now	2017-11-06 11:07:26 -07:00
cglewis	55610b8425	MAINTAINER is deprecated, using LABEL now	2017-10-31 18:21:12 -07:00
Nicolas Duchon	56fb58cc6f	Update doc for mozilla modern profile	2017-10-27 10:28:42 +02:00
Nicolas Duchon	ea98780960	Enable optional mozilla modern profile	2017-10-27 10:28:42 +02:00
Jason Wilder	1b868259fe	Merge pull request #955 from buchdag/dhparam-separate-container ... Fix default dhparam.pem when using separate containers	2017-10-26 10:09:18 -06:00
Nicolas Duchon	3ac478f284	Update Diffie-Hellman Groups doc ... + corrected a typo	2017-10-25 12:34:22 +02:00
Nicolas Duchon	2528a35656	Don't presume the existence of default dhparam ... The default dhparam at /etc/nginx/dhparam/dhparam.pem won't be auto generated with the separate containers setup.	2017-10-25 12:32:09 +02:00
Jason Wilder	3ef600a3b5	Merge pull request #842 from kamermans/feature/external_internal_network ... Allow containers to be restricted to internal network	2017-10-20 10:04:08 -06:00
Jason Wilder	fc36514eb8	Merge pull request #863 from qiqizjl/master ... support fastcgi	2017-10-20 10:00:27 -06:00
Jason Wilder	795e153c2e	Merge pull request #951 from kamermans/bugfix/ipv6_resolvers ... Added support for IPv6 DNS servers in resolver generation (issue #938)	2017-10-20 09:50:56 -06:00
Steve Kamerman	5d503b48cb	Added support for IPv6 DNS servers in resolver generation (issue #938)	2017-10-19 20:58:34 -04:00
Steve Kamerman	93d90884e2	Implemented NETWORK_ACCESS (squash commit)	2017-10-18 13:29:12 -04:00
Jason Wilder	f05f7a0ff9	Merge pull request #574 from teohhanhui/ocsp-stapling-chain ... Enable OCSP stapling if certificate trust chain is provided	2017-08-16 11:53:17 -06:00
Jason Wilder	817db85aae	Merge pull request #898 from remipichon/master ... Do not bind upstream with 'ingress' network	2017-08-16 10:12:18 -06:00
Jason Wilder	df24d9dff5	Merge pull request #901 from brikou/patch-2 ... Simplify docker-compose.yml example	2017-08-13 15:57:09 -06:00
Brikou CARRE	343791b657	Simplify docker-compose.yml example ... Remove `container_name` as not required	2017-08-12 07:37:05 +02:00
Remi Pichon	fff84de367	Do not bind upstream with 'ingress' network ... Merging https://github.com/jwilder/nginx-proxy/pull/774 and a8ee64b059	2017-08-10 12:30:00 +02:00
Teoh Han Hui	065dd7f1ea	Fix build	2017-07-31 17:46:58 +08:00
Teoh Han Hui	dfe7677eb5	Enable OCSP stapling if certificate trust chain is provided ... Previously disabled in 080a5157e6	2017-07-31 17:46:58 +08:00
Steve Kamerman	0cc71fad49	Add dynamically-computed DNS resolvers to nginx (for PR #574)	2017-07-31 17:44:27 +08:00
Jason Wilder	6bdd184d6a	Merge pull request #882 from matt-hh/feature/auto-update-from-upstream-nginx ... Move to 1.13 base image to get auto updates	2017-07-21 08:53:48 -06:00
Matthias Döring	febf85d7e2	Move to 1.13 base image to get auto updates ... Less maintenance and more security Resolves #880	2017-07-21 13:45:33 +02:00
耐小心	2eb2ae9c93	support fastcgi	2017-06-24 14:48:05 +08:00
耐小心	29fffd6de8	Revert "support fastcgi" ... This reverts commit 8ac755e1d6.	2017-06-24 14:05:42 +08:00
NaiXiaoXin	8ac755e1d6	support fastcgi	2017-06-24 13:51:02 +08:00
Jason Wilder	02121df3b9	Merge pull request #589 from kamermans/feature_ssl_improvement ... SSL security enhancement	2017-06-22 11:54:51 -06:00
Jason Wilder	14779ec4be	Merge pull request #860 from jwilder/jw-travis ... Update docker	2017-06-22 11:46:48 -06:00
Jason Wilder	a318b57408	Update docker	2017-06-22 11:36:40 -06:00
Jason Wilder	57a33aaf8b	Merge pull request #849 from Neilpang/Branch_0.6.0 ... running proxy on host network	2017-06-22 09:50:39 -06:00
Steve Kamerman	026ba7cdac	Added DHParam compatibility note	2017-06-18 21:30:59 -04:00
Steve Kamerman	761bbf9dbc	Removed duplicate server_names_hash_bucket_size directive	2017-06-18 21:21:05 -04:00
Jason Wilder	c41186a3a4	Merge branch 'master' into feature_ssl_improvement	2017-06-14 16:31:12 -06:00
Jason Wilder	90b62e0abc	Merge pull request #851 from Neilpang/worker_processes ... fix worker_processes to "auto"	2017-06-12 19:23:29 -06:00
neil	a3cd96ead4	alpine fix worker_processes to "auto"	2017-06-13 09:11:27 +08:00
Jason Wilder	e3b6be79fc	Merge pull request #847 from jwilder/appropriate-trim-earlier ... Trim $host and $proto before they are used	2017-06-12 09:48:27 -06:00
neil	1867228cce	fix worker_processes to "auto"	2017-06-12 15:59:55 +08:00
neilpang	a8ee64b059	running proxy on host network	2017-06-10 15:07:45 +08:00