1
0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-22 11:56:31 +00:00
Commit Graph

490 Commits

Author SHA1 Message Date
Jason Wilder
f837d1256a Merge pull request #670 from thomasleveil/parallel-tests
TRAVIS: run debian and alpine tests in parallel
2017-01-07 14:04:40 -07:00
Thomas LEVEIL
8d017504c0 TRAVIS: run debian and alpine tests in parallel 2017-01-07 21:07:34 +01:00
Jason Wilder
31a0a844e3 Merge pull request #558 from matt-hh/alpine
Add alpine base image
2017-01-05 18:05:38 -07: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
Jason Wilder
a7bc426b61 Merge pull request #666 from matt-hh/feature/upgrade-1.11.8
Upgrade to nginx 1.11.8
2016-12-28 18:42:02 -07:00
Matthias Döring
c1d93d112a Upgrade nginx-alpine to 1.11.8 2016-12-29 00:18:06 +01:00
Matthias Döring
2a8f4554a7 Merge branch 'master' into alpine
* master:
  Updated nginx to 1.11.6
  Travis-CI's apt-get doesn't have --allow-downgrades yet, which is annoying because --force-yes is deprecated
  Put --allow-downgrades in the right place
  Upgrade docker-engine and allow downgrades
  Clarified a couple parts in the README
  Comment typo
  Added httpoxy test
  Updated README to reflect X-Forwarded-Port
  Implemented more advanced webserver with routing and request header echoing, added header tests
  Honor upstream forwarded port if available
  add ssl_session_tickets to default site
  Replace "replace" to "trimSuffix"
  do not enable HSTS for subdomains
  Remove proxy-tier network in favor of the default.
  Added X-Forwarded-Port
  Add docker-compose file for separate containers.
  connect to uWSGI backends
2016-12-29 00:02:05 +01:00
Matthias Döring
004cc3cb8c Upgrade to nginx 1.11.8 2016-12-28 23:38:47 +01:00
Jason Wilder
6186fbf8b0 Merge pull request #653 from cramaker/feature/nginx-1.11.6
Updated nginx to 1.11.6
2016-12-08 12:59:56 -07:00
Cody Ramaker
b66398d1bf Updated nginx to 1.11.6 2016-12-08 13:24:49 -06:00
Jason Wilder
40872c9b43 Merge pull request #649 from kamermans/travisci_fix
Travis-CI - upgrade docker-engine and allow downgrades
2016-12-05 10:10:27 -07:00
Steve Kamerman
59b8806859 Travis-CI's apt-get doesn't have --allow-downgrades yet, which is annoying because --force-yes is deprecated 2016-12-05 09:33:44 -05:00
Steve Kamerman
271729aaaa Put --allow-downgrades in the right place 2016-12-05 09:29:08 -05:00
Steve Kamerman
dc910107cf Upgrade docker-engine and allow downgrades 2016-12-05 09:21:39 -05: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
Jason Wilder
51aeee9a2c Merge pull request #619 from max-wilkinson/master
Clarified a couple parts in the README
2016-11-27 13:19:34 -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
b0de80d46b Moved config edits from Dockerfile to template 2016-10-03 10:21:31 -04:00
Steve Kamerman
8534185b0c Added newline to config 2016-10-03 10:05:55 -04:00
Steve Kamerman
8cf0b75d80 Updated README with HTTPS_METHOD=nohttps 2016-10-01 11:25:11 -04:00
Steve Kamerman
374b1256cd Add HTTPS_METHOD=https to disable SSL site 2016-10-01 11:22:48 -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
d3a0da451a TLSv1 End-of-life pushed to June 30, 2018, rolled back for compatibility 2016-09-29 21:35:37 -04:00
Steve Kamerman
c51c9980cf Removed TLS 1.0 as it is considered unsafe and must be disabled for PCI compliance 2016-09-29 19:52:20 -04:00
Steve Kamerman
6f2b3f1c54 Issue #586 Removed DES-based SSL ciphers 2016-09-29 17:10:17 -04:00
Steve Kamerman
0b1e9e56e1 Issue #535 Added default 2048-bit dhparam.pem file 2016-09-29 16:48:18 -04:00
Steve Kamerman
9ef0bb3356 Comment typo 2016-09-29 16:06:53 -04:00
Steve Kamerman
b9bf183df2 Added httpoxy test 2016-09-29 15:43:07 -04:00
Steve Kamerman
7422539f20 Updated README to reflect X-Forwarded-Port 2016-09-29 15:42:49 -04:00
Steve Kamerman
112aad39b6 Implemented more advanced webserver with routing and request header echoing, added header tests 2016-09-29 15:36:01 -04:00
Steve Kamerman
124b8cd757 Honor upstream forwarded port if available 2016-09-29 11:33:21 -04:00
Steve Kamerman
6ebbdb10c7 Merge branch 'master' into feature_x_forwarded_port 2016-09-29 11:26:51 -04:00
Jason Wilder
0670a13d92 Merge pull request #581 from chulkilee/ssl_session_tickets
add ssl_session_tickets to default site
2016-09-24 20:22:16 -06:00
Chulki Lee
4661bf4dd9 add ssl_session_tickets to default site
Fixes #580
2016-09-23 21:58:09 -07:00
Jason Wilder
760936d9ea Merge pull request #572 from pvlg/patch-2
Replace "replace" to "trimSuffix"
2016-09-17 09:58:27 -06:00
pvlg
fe9a538ec8 Replace "replace" to "trimSuffix"
I have a domain key-mydomain.com. When I add domain www.key-mydomain.com with ssl cert I did not get the desired result. Function replace cut name ssl cert "www.key-mydomain.com.key" to "www-mydomain.com".
2016-09-17 16:53:01 +03:00
Jason Wilder
f02bc98a6e Merge pull request #566 from mplx/patch/hsts-no-subdomains
do not enable HSTS for subdomains
2016-09-13 09:18:27 -06:00
mplx
37323320c8 do not enable HSTS for subdomains 2016-09-12 09:46:59 +02: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
Matthias Döring
7d05f0d924 Add nginx alpine to update-dependencies task 2016-09-03 12:05:27 +02:00
Matthias Döring
ba55d1a0b6 Add alpine base image
- Inspired by #408
- Possible solution for #543
2016-09-02 17:11:36 +02:00
Jason Wilder
e95d3e9fdf Merge pull request #555 from freakinruben/patch-1
Update ciphers and HTST settings to get A+ rating
2016-09-01 09:21:56 -06:00
Ruben
87879c1ee2 Update ciphers and HTST settings to get A+ rating
The default config gets you an 'A' rating. Cipher settings are copied from [Mozilla SSL Configartion Generator](https://mozilla.github.io/server-side-tls/ssl-config-generator/?server=nginx-1.10.1&openssl=1.0.1t&hsts=yes&profile=intermediate)
2016-09-01 11:34:56 +02:00
Jason Wilder
579bc1bf6e Merge pull request #518 from huiwang/nginx_upgrade
upgrade nginx to 1.11.3
2016-08-25 20:55:54 -06:00
hwang
176b78943e upgrade nginx to 1.11.3 in makefile 2016-08-25 21:46:57 +02:00
Jason Wilder
a6287d7df1 Merge pull request #545 from auchri/patch-1
Update .travis.yml
2016-08-25 12:30:16 -06:00