Commit graph

  • 495b0ad8b6 Add circleci build status badge Jason Wilder 2015-10-08 22:08:04 -0600
  • 289a519dce Merge pull request #246 from thomasleveil/fix/197 Jason Wilder 2015-10-08 22:01:15 -0600
  • a81bb961e4 Merge pull request #252 from lsde/master 0.2.0 Jason Wilder 2015-10-08 20:53:16 -0600
  • 5c2280df84 fix condition for default config location Jonas Svatos 2015-10-08 12:03:28 +0200
  • 2ffa3a182f Merge pull request #248 from appropriate/missing-access-log Jason Wilder 2015-10-07 09:04:13 -0600
  • 6b5e12a946 Add missing access_log statement to HTTPS fallback Mike Dillon 2015-10-06 21:18:00 -0700
  • 92be4b6d54 doc Thomas LEVEIL 2015-09-30 23:57:13 +0000
  • 865b14e029 tests: fix minor bug in docker_wait_for_log Thomas LEVEIL 2015-09-30 23:56:25 +0000
  • b4d1acbf2d tests: refactoring Thomas LEVEIL 2015-09-30 23:40:04 +0000
  • 3f223abeb8 Merge pull request #240 from rarous/master Jason Wilder 2015-09-30 12:01:09 -0600
  • 4bd30f5d2c add test suite. See #197 Thomas LEVEIL 2015-09-13 19:33:11 +0000
  • d46d9ad943 Use nginx 1.9.5 badge in readme Aleš Roubíček 2015-09-23 17:49:51 +0200
  • e06d5917a2 Use HTTP/2 instead of SPDY Aleš Roubíček 2015-09-23 17:48:40 +0200
  • 249fb204f1 Use HTTP/2 instead of SPDY Aleš Roubíček 2015-09-23 17:47:18 +0200
  • d45c10ca66 Use nginx 1.9.5 Aleš Roubíček 2015-09-23 17:43:31 +0200
  • 8c193ba7e1 Merge pull request #215 from gradecam/feature/customize_improvements Jason Wilder 2015-09-12 15:23:53 -0600
  • bddb647b5f Merge pull request #230 from appropriate/remove_duplicate_access_log_entries Jason Wilder 2015-09-12 15:12:31 -0600
  • 9e55f5382f Merge pull request #225 from funkygibbing/default-ssl Jason Wilder 2015-09-12 15:05:53 -0600
  • 83b0b25c26 Merge pull request #228 from berfarah/patch-1 Jason Wilder 2015-09-12 15:00:00 -0600
  • 9440ebed09 Merge pull request #235 from thomasleveil/safeguard Jason Wilder 2015-09-12 14:56:39 -0600
  • d21c6943a2 Merge pull request #1 from appropriate/safeguard Thomas LÉVEIL 2015-09-12 16:52:01 +0200
  • f95ff82ad0 Adjust entrypoint to always warn on missing socket Mike Dillon 2015-09-12 07:18:12 -0700
  • 1aac996019 conform to Docker official images best practices Thomas LEVEIL 2015-09-12 10:37:21 +0000
  • d83ba3da1e refuse to start if the docker sock isn't available Thomas LEVEIL 2015-09-11 22:05:54 +0000
  • 900a676af8 Move access_log from the http level to server Mike Dillon 2015-08-23 09:00:58 -0700
  • d844c124ff Bumping to latest Docker Gen version Bernardo Farah 2015-09-01 09:38:43 -0700
  • ae0da36d75 Fix bugs in config file from refactor CoreOS Admin 2015-08-29 18:38:43 -0600
  • e47df7a884 Merge pull request #224 from appropriate/remove-boot2docker-instructions Jason Wilder 2015-08-26 15:46:04 -0600
  • d066bd32e0 Fix for #188 - add SSL server block outside hosts loop Ray Walker 2015-08-26 18:35:47 +1000
  • d3f56468b1 Fix for #188 - remove hostname from default SSL block Ray Walker 2015-08-26 12:49:59 +1000
  • e5ad1ecfd1 Remove boot2docker-specific instructions Mike Dillon 2015-08-24 19:37:45 -0700
  • 214ff827d3 Merge pull request #223 from appropriate/readme-expose-requirement Jason Wilder 2015-08-23 20:59:51 -0600
  • 682914dec7 Document the need to EXPOSE the proxied port Mike Dillon 2015-08-23 18:39:49 -0700
  • 924fcd7984 Remove error_log setting from nginx.tmpl Mike Dillon 2015-08-23 09:00:23 -0700
  • 24859e3f92 Merge pull request #220 from RichLewis007/RichLewis007-patch-typos-1 Jason Wilder 2015-08-19 22:34:22 -0600
  • 235528338c fix 2 minor English language typos Rich 2015-08-19 23:52:54 -0400
  • 5089bf77dd Update wording in docs as per pull request feedback Richard Bateman 2015-08-14 12:34:10 -0600
  • 66711ff026 Add warning about consequences of incorrectly using proxy_config.conf Richard Bateman 2015-08-14 12:19:53 -0600
  • 405f4876b9 As per pull request feedback, update names to be consistent Richard Bateman 2015-08-14 12:10:47 -0600
  • d9ee7ed704 Add support for adding options to the location block of a vhost Richard Bateman 2015-08-14 11:36:39 -0600
  • b131b00e19 Add support for vhosts.d/defaults file with default vhost options Richard Bateman 2015-08-14 11:34:56 -0600
  • d07a7d7487 Fix example command in docs Richard Bateman 2015-08-14 11:31:58 -0600
  • 2eff96969a Add support for overriding default proxy settings Richard Bateman 2015-08-14 11:29:44 -0600
  • 23ae831198 Merge pull request #202 from webner/default_host Jason Wilder 2015-08-11 23:41:53 -0600
  • 6965b1ead4 fallback when DEFAULT_HOST is not set Wolfgang Ebner 2015-07-26 11:38:45 +0200
  • b0647dd5e9 set default_server also for https Wolfgang Ebner 2015-07-24 10:39:56 +0200
  • e1c685b679 Update boot2docker instructions 0.1.0 Jason Wilder 2015-07-20 10:05:01 -0600
  • 2d0417692b Merge pull request #192 from viranch/swarm-node Jason Wilder 2015-07-20 10:00:33 -0600
  • abb42bbc52 Update nginx badge to 1.9.2 Jason Wilder 2015-07-16 16:55:54 -0600
  • 4f5351265a Use define & template for re-usable blocks of upstream server template Viranch Mehta 2015-07-15 20:51:10 +0530
  • 784507df1a Cascade two else blocks into one using coalesce on VIRTUAL_PORT and 80 Viranch Mehta 2015-07-11 01:19:44 +0530
  • 5fe7c4f60d Merge pull request #194 from topiaruss/fix_typos Jason Wilder 2015-07-07 08:21:56 -0600
  • dece1e8ef4 Trivial text improvements Russ Ferriday 2015-07-07 11:07:45 +0100
  • c4923d1f58 Use container host's IP:port if we're connected to a swarm master Viranch Mehta 2015-07-04 18:43:52 +0530
  • ae85ec013b Merge pull request #186 from appropriate/prevent-generating-broken-config Jason Wilder 2015-06-29 23:40:11 -0600
  • f36ca3d7a3 Prevent generating broken config Mike Dillon 2015-06-23 17:05:12 -0700
  • 0bab8934c3 Merge pull request #185 from josephpage/patch-1 Jason Wilder 2015-06-22 09:35:22 -0600
  • 89fe2a3898 Update to nginx 1.9.2 Joseph Page 2015-06-20 22:25:52 +0200
  • 7123f31652 Merge pull request #174 from rtrauntvein/173-rodockersock Jason Wilder 2015-06-05 12:58:37 -0600
  • 6719f7636f Encourage using read-only mount for docker.sock Ryan Trauntvein 2015-06-05 10:24:45 -0700
  • 02bc7d2c1b Merge pull request #170 from kcyeu/master Jason Wilder 2015-05-22 16:15:02 -0600
  • d74a4146c8 fix indention, and file nameing Kuo-Cheng Yeu 2015-05-21 23:43:09 +0800
  • da0191a778 add 'Diffie-Hellman Groups' section in README.md Kuo-Cheng Yeu 2015-05-21 15:37:19 +0800
  • a10d1b50bf add support for ssl_dhparams to prevent 'Logjam' attack Kuo-Cheng Yeu 2015-05-21 15:19:58 +0800
  • 2b270c9353 Merge pull request #168 from bprodoehl/master Jason Wilder 2015-05-19 14:53:00 -0600
  • 3954774d65 Fix a couple things in the README. Brian Prodoehl 2015-05-19 16:16:50 -0400
  • 503072c03f Merge pull request #72 from BenHall/default_host Jason Wilder 2015-05-14 10:00:04 -0600
  • 11a8e51620 Merge pull request #163 from mko-x/close-non-ws Jason Wilder 2015-05-10 23:16:37 -0600
  • b680fb003e Close marker instead of empty Markus Kosmal 2015-05-09 23:15:26 +0200
  • 05a80c150a Merge pull request #152 from kcyeu/master Jason Wilder 2015-05-03 22:46:33 -0600
  • ad4be3b2e4 Merge pull request #154 from appropriate/nginx-1.9 Jason Wilder 2015-05-03 22:46:07 -0600
  • 94fd06b98c Update README.md to refer to nginx 1.9.0 Mike Dillon 2015-05-02 15:57:48 -0700
  • 7eb785cec5 Update base image to nginx:1.9.0 Mike Dillon 2015-05-01 14:01:30 -0700
  • 4d2403b5d7 Add SPDY support Kuo-Cheng Yeu 2015-04-29 14:41:25 +0800
  • 44a5322ce7 Merge pull request #142 from schmunk42/patch-1 Jason Wilder 2015-04-09 16:10:13 -0600
  • ce3f1fa7ca show command on multiple lines, increased readability Tobias Munk 2015-04-09 22:08:59 +0200
  • 1e56a0e982 Merge pull request #136 from RnbWd/master Jason Wilder 2015-03-31 23:18:27 -0600
  • e4a5d9a510 update David Wisner 2015-03-31 21:28:02 -0700
  • d87210ef30 Merge pull request #135 from md5/nginx-1.7.11 Jason Wilder 2015-03-30 09:07:05 -0600
  • ead1912590 Update to Nginx 1.7.11 Mike Dillon 2015-03-27 10:11:54 -0700
  • 95df1d225e Update to docker-gen 0.3.9 Jason Wilder 2015-03-13 17:25:53 -0600
  • 98254dd565 Merge pull request #123 from berfarah/master Jason Wilder 2015-03-13 17:04:45 -0600
  • 1f426a6e61 Updated docker-gen version to 0.3.8 Bernardo Farah 2015-03-13 14:53:40 -0700
  • 5216c71418 Merge pull request #119 from md5/update-nginx-1.7.10 Jason Wilder 2015-03-10 23:19:52 -0600
  • 8d885aac1a Update to nginx:1.7.10 Mike Dillon 2015-03-10 21:15:42 -0700
  • f03c08068b Merge pull request #111 from jwilder/jw-hsts Jason Wilder 2015-03-04 14:00:04 -0700
  • 4a99ac5548 Remove includeSubdomains from HSTS header Jason Wilder 2015-02-28 15:50:59 -0700
  • 879bb59d90 Merge pull request #108 from md5/fix-wildcard-https-redirect Jason Wilder 2015-02-25 11:37:21 -0700
  • aa5dfdb3d5 Fix HTTP->HTTPS redirect for wildcard hosts Mike Dillon 2015-02-25 10:29:59 -0800
  • d831c058f3 Merge pull request #106 from md5/per-vhost-includes Jason Wilder 2015-02-23 12:20:55 -0700
  • c3534b7195 Merge pull request #91 from pirelenito/master Jason Wilder 2015-02-22 15:00:48 -0700
  • 927e583f6a Document custom config for multi-host VIRTUAL_HOST Mike Dillon 2015-02-22 11:19:33 -0800
  • c4b3955ab9 Fix typo; shorten example conf file name Mike Dillon 2015-02-22 10:02:13 -0800
  • d4d9755a42 Document custom Nginx configuration in README.md Mike Dillon 2015-02-22 09:50:19 -0800
  • 2010332395 Support per-VIRTUAL_HOST Nginx conf files Mike Dillon 2015-02-22 09:25:50 -0800
  • a431122d8b Merge pull request #102 from md5/virtual-proto Jason Wilder 2015-02-15 16:32:33 -0700
  • 3f199d56c1 Add VIRTUAL_PROTO to README.md Mike Dillon 2015-02-14 16:19:27 -0800
  • 6c3b3c87be Support VIRTUAL_PROTO=https for HTTPS backends Mike Dillon 2015-02-14 16:02:39 -0800
  • 93ee4acb23 Fix grammar Jason Wilder 2015-02-03 14:55:14 -0700
  • 71a17c127f Update SSL doc grammar Jason Wilder 2015-01-29 09:42:58 -0700