Commit Graph

282 Commits

Author SHA1 Message Date
Viranch Mehta 784507df1a Cascade two else blocks into one using coalesce on VIRTUAL_PORT and 80
This also takes care of the case when VIRTUAL_PORT is not actually
exposed.
2015-07-11 01:19:44 +05:30
Jason Wilder 5fe7c4f60d Merge pull request #194 from topiaruss/fix_typos
Trivial text improvements
2015-07-07 08:21:56 -06:00
Russ Ferriday dece1e8ef4 Trivial text improvements 2015-07-07 11:07:45 +01:00
Viranch Mehta c4923d1f58 Use container host's IP:port if we're connected to a swarm master 2015-07-04 18:43:52 +05:30
Jason Wilder ae85ec013b Merge pull request #186 from appropriate/prevent-generating-broken-config
Prevent generating broken config
2015-06-29 23:40:11 -06:00
Mike Dillon f36ca3d7a3 Prevent generating broken config
Fixes #115
2015-06-23 17:05:12 -07:00
Jason Wilder 0bab8934c3 Merge pull request #185 from josephpage/patch-1
Update to nginx 1.9.2
2015-06-22 09:35:22 -06:00
Joseph Page 89fe2a3898 Update to nginx 1.9.2 2015-06-20 22:25:52 +02:00
Jason Wilder 7123f31652 Merge pull request #174 from rtrauntvein/173-rodockersock
Encourage using read-only mount for docker.sock
2015-06-05 12:58:37 -06:00
Ryan Trauntvein 6719f7636f Encourage using read-only mount for docker.sock 2015-06-05 10:24:45 -07:00
Jason Wilder 02bc7d2c1b Merge pull request #170 from kcyeu/master
Add support for ssl_dhparam to prevent 'Logjam' attack
2015-05-22 16:15:02 -06: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
Kuo-Cheng Yeu a10d1b50bf add support for ssl_dhparams to prevent 'Logjam' attack 2015-05-21 15:19:58 +08:00
Jason Wilder 2b270c9353 Merge pull request #168 from bprodoehl/master
Fix a couple things in the README.
2015-05-19 14:53:00 -06: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
Jason Wilder 11a8e51620 Merge pull request #163 from mko-x/close-non-ws
Close marker instead of empty
2015-05-10 23:16:37 -06:00
Markus Kosmal b680fb003e Close marker instead of empty 2015-05-09 23:15:26 +02:00
Jason Wilder 05a80c150a Merge pull request #152 from kcyeu/master
Add SPDY support
2015-05-03 22:46:33 -06:00
Jason Wilder ad4be3b2e4 Merge pull request #154 from appropriate/nginx-1.9
Update base image to nginx:1.9.0
2015-05-03 22:46:07 -06:00
Mike Dillon 94fd06b98c Update README.md to refer to nginx 1.9.0 2015-05-02 15:57:48 -07:00
Mike Dillon 7eb785cec5 Update base image to nginx:1.9.0 2015-05-01 14:01:30 -07:00
Kuo-Cheng Yeu 4d2403b5d7 Add SPDY support 2015-04-29 14:41:25 +08:00
Jason Wilder 44a5322ce7 Merge pull request #142 from schmunk42/patch-1
show command on multiple lines, increased readability
2015-04-09 16:10:13 -06:00
Tobias Munk ce3f1fa7ca show command on multiple lines, increased readability 2015-04-09 22:08:59 +02:00
Jason Wilder 1e56a0e982 Merge pull request #136 from RnbWd/master
update readme
2015-03-31 23:18:27 -06:00
David Wisner e4a5d9a510 update 2015-03-31 21:28:02 -07:00
Jason Wilder d87210ef30 Merge pull request #135 from md5/nginx-1.7.11
Update to Nginx 1.7.11
2015-03-30 09:07:05 -06:00
Mike Dillon ead1912590 Update to Nginx 1.7.11 2015-03-27 10:11:54 -07:00
Jason Wilder 95df1d225e Update to docker-gen 0.3.9 2015-03-13 17:25:53 -06:00
Jason Wilder 98254dd565 Merge pull request #123 from berfarah/master
Updated docker-gen version to 0.3.8
2015-03-13 17:04:45 -06:00
Bernardo Farah 1f426a6e61 Updated docker-gen version to 0.3.8 2015-03-13 14:53:40 -07:00
Jason Wilder 5216c71418 Merge pull request #119 from md5/update-nginx-1.7.10
Update to nginx:1.7.10
2015-03-10 23:19:52 -06:00
Mike Dillon 8d885aac1a Update to `nginx:1.7.10` 2015-03-10 21:15:42 -07:00
Jason Wilder f03c08068b Merge pull request #111 from jwilder/jw-hsts
Remove includeSubdomains from HSTS header
2015-03-04 14:00:04 -07:00
Jason Wilder 4a99ac5548 Remove includeSubdomains from HSTS header
includeSubdomains can lead to issues where not all subdomains are
able to use HTTPS.  This options might be too strict for the general
case: https://www.owasp.org/index.php/HTTP_Strict_Transport_Security.
It can be re-enabled w/ a custom template if needed.

Fixes #109
2015-02-28 15:50:59 -07:00
Jason Wilder 879bb59d90 Merge pull request #108 from md5/fix-wildcard-https-redirect
Fix HTTP->HTTPS redirect for wildcard hosts
2015-02-25 11:37:21 -07:00
Mike Dillon aa5dfdb3d5 Fix HTTP->HTTPS redirect for wildcard hosts
Uses Nginx's $host instead of interpolating `{{ $host }}` in the template
2015-02-25 10:29:59 -08:00
Jason Wilder d831c058f3 Merge pull request #106 from md5/per-vhost-includes
Per VIRTUAL_HOST configuration files
2015-02-23 12:20:55 -07:00
Jason Wilder c3534b7195 Merge pull request #91 from pirelenito/master
fixes SSL support while mixing HTTPS and non-HTTPS hosts
2015-02-22 15:00:48 -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 2010332395 Support per-VIRTUAL_HOST Nginx conf files 2015-02-22 09:25:50 -08:00
Jason Wilder a431122d8b Merge pull request #102 from md5/virtual-proto
Support VIRTUAL_PROTO=https for HTTPS backends
2015-02-15 16:32:33 -07:00
Mike Dillon 3f199d56c1 Add VIRTUAL_PROTO to README.md 2015-02-14 16:19:27 -08:00
Mike Dillon 6c3b3c87be Support VIRTUAL_PROTO=https for HTTPS backends 2015-02-14 16:02:39 -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