Fabio/nginx-proxy-auto-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
207 commits 10 branches 36 tags 13 MiB
Commit graph

53 commits

Author SHA1 Message Date
David Li
8313d9f9a1 Merge 5e927d4ac3 into defed25585 2015-10-17 22:57:04 +00: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
David Li
5e927d4ac3 feat(ssl): Allow using .pem for public key file 
Try using $cert.pem as the certificate before falling back to
  $cert.crt, as .pem is the standard file extension for
  certificates. (RFC1421, RFC1424). This is different from the
  current behaviour, where only the .crt is used.

  NOTE: This could cause a regression if users have both a .pem and
  a .crt file in the /etc/nginx/certs directory. In that
  situation, the .pem will be used instead of the .crt, which
  can be problematic if the files contain different information
  (i.e. one contains the entire certificate chain, while the other
  does not). If this is an issue, the order can be changed so that
  the current behaviour is default.

Signed-off-by: David Li <jiawei.davidli@gmail.com>
 2015-09-29 19:47:29 -04: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