Commit graph

449 commits

Author SHA1 Message Date
neil
c9e8e8259d flush cache 2017-06-06 14:13:15 +08:00
neil
01f3b3236d fix cronjob 2017-06-06 10:10:52 +08:00
neil
f20864f42e move cron to shell 2017-06-06 09:20:50 +08:00
neilpang
19cce31a09 add ENABLE_HSTS, "false" by default to disable HSTS. 2017-06-05 23:19:30 +08:00
neilpang
45e89592d3 location is needed for acme.sh nginx mode 2017-06-05 22:42:06 +08:00
neilpang
4e884e2258 fix typo 2017-06-04 21:37:41 +08:00
neilpang
cd1e368128 update doc for letsencrypt 2017-06-03 21:32:15 +08:00
neilpang
f8542b6515 EXPOSE 443 2017-06-03 20:48:18 +08:00
neilpang
a333e242ff move server name back 2017-06-03 20:31:56 +08:00
neilpang
f4c77d13dd fix reload 2017-06-03 19:54:42 +08:00
neilpang
ac19d7387d Revert "move listen 80 to the first line." 2017-06-03 19:32:29 +08:00
neilpang
0bf5903602 fix reload 2017-06-03 18:54:10 +08:00
neilpang
c2c069bd8f fix reload cmd 2017-06-03 18:51:02 +08:00
neilpang
d511153ee4 fix cron 2017-06-03 18:38:17 +08:00
neilpang
7facc23dc0 move listen 80 to the first line. 2017-06-03 18:07:57 +08:00
neilpang
ceec29af20 minor 2017-06-03 17:26:53 +08:00
neilpang
ecb0e29a2c fix acme 2017-06-03 17:21:23 +08:00
neilpang
efc1f9100a Merge branch 'master' of https://github.com/Neilpang/nginx-proxy 2017-06-03 16:52:26 +08:00
neilpang
9ee4d49cb7 fix typos 2017-06-03 16:52:12 +08:00
root
508bbf7d02 exmode 2017-06-03 16:33:31 +08:00
neilpang
76233f2032 add acme.sh to support auto ssl 2017-06-03 16:31:21 +08:00
neilpang
2f401447c7 generate single server section for one container with multiple vhost domains. 2017-06-03 15:30:33 +08:00
Jason Wilder
23a2c7d848 Merge pull request #812 from thueske/master
Upgrade to 1.13.0
2017-05-04 15:39:57 -06:00
Tobias Hüske
2c4102d396 Upgrade to 1.13.0 2017-05-04 18:57:00 +02:00
Jason Wilder
fed6df3756 Merge pull request #768 from thomasleveil/wildcard_cert_nohttps
TESTS: add test for wildcard cert + nohttps + default.crt
2017-05-03 17:02:40 -06:00
Jason Wilder
965c722344 Merge pull request #810 from rtalvarez/readme-typo
Fix README typo
2017-05-03 16:57:40 -06:00
Roberto Alvarez
f2487741dc Fix README typo
Fixed a small typo/error with "the a" host
2017-05-03 11:06:34 -05:00
Jason Wilder
b6a445b1a9 Merge pull request #790 from versada/fix-typo
DOC: fixed typo
2017-04-11 10:48:12 -06:00
Naglis Jonaitis
cf88817355
DOC: fixed typo 2017-04-11 11:43:47 +03:00
Jason Wilder
851b0e36cd Merge pull request #789 from matt-hh/feature/upgrade-1.11.13
Upgrade to nginx 1.11.13
2017-04-07 09:38:33 -06:00
Matthias Döring
172d79aff4 Upgrade to nginx 1.11.13 2017-04-07 12:58:49 +02:00
Jason Wilder
619943ac1e Merge pull request #770 from sischnei/http2-in-readme
Updated README to include HTTP/2.0
2017-03-18 09:38:16 -06:00
sischnei
6fd32b5a9b Updated README to include HTTP/2.0 2017-03-18 10:52:43 +01:00
Thomas LEVEIL
8414a94d59 TESTS: add test for the case in which a wildcard cert matches a container having nohttps set 2017-03-15 02:12:07 +01:00
Jason Wilder
82133865d4 Merge pull request #767 from thomasleveil/patch-1
DOC: reflect change from PR #344
2017-03-14 18:57:53 -06:00
Thomas LÉVEIL
77e022cf28 DOC: reflect change from PR #344
PR #344 changed the HTTP status code from `503` to `500`. The README.md file was not updated accordingly.
2017-03-15 01:32:47 +01:00
Jason Wilder
d5deff21c5 Merge pull request #757 from thomasleveil/issue/755
TEST: fix #755: Tests fail with new Docker version scheme
2017-03-07 23:34:45 -07:00
Thomas LEVEIL
99a569b2e6 fix #755: Tests fail with new Docker version scheme
Docker introduced a [new version scheme](https://blog.docker.com/2017/03/docker-enterprise-edition/). As the result, the latest docker version is now `17.03.0-ce`.
2017-03-06 23:36:16 +01:00
Jason Wilder
6554a1cf28 Merge pull request #732 from matt-hh/feature/upgrade-1.11.10
Upgrade to nginx 1.11.10
2017-02-21 10:18:23 -07:00
Matthias Döring
7bafa37a52 Upgrade to nginx 1.11.10 2017-02-21 14:03:54 +01:00
Jason Wilder
9e31d5042f Merge pull request #735 from thomasleveil/test_events
TESTS: add a test to verify nginx conf is updated
2017-02-20 22:57:19 -07:00
Thomas LEVEIL
2aef648f3d TESTS: add a test to verify nginx conf is update on container creation/deletion 2017-02-21 03:20:38 +01:00
Jason Wilder
68816390ee Merge pull request #655 from thomasleveil/pytest
rewrite tests using docker-compose and pytest
2017-02-18 09:52:38 -07:00
Thomas LEVEIL
dd443f3eca TESTS: ignore the requirements and certs directory when collecting tests 2017-02-17 01:24:48 +01:00
Thomas LEVEIL
9620be91fa TESTS: separated containers: fix indentation and remove dependency over jwilder/whoami image 2017-02-17 01:11:11 +01:00
Thomas LEVEIL
85370fa31f TESTS: improve error reporting for failed to run docker-compose commands 2017-02-17 00:54:14 +01:00
Thomas LEVEIL
6069bc53cd TESTS: replace old test suite with the new one
get rid of Bats definitively
2017-02-17 00:29:30 +01:00
Thomas LEVEIL
250a01d235 TESTS: add tests for IPv6 support 2017-02-16 23:27:28 +01:00
Thomas LEVEIL
78375632dd TESTS: adjust Travis-CI config (upgrade to docker 1.13 and no more docker-compose) 2017-02-16 21:40:54 +01:00
Thomas LEVEIL
a6e4f7f3ad TESTS: adjust Travis-CI config 2017-02-16 21:40:54 +01:00