Jakub Warmuz
|
8f4280c2df
|
Merge remote-tracking branch 'github/letsencrypt/master' into cli-config-fixes
Conflicts:
letsencrypt_apache/tests/util.py
letsencrypt_nginx/tests/util.py
|
2015-06-20 20:04:58 +00:00 |
|
Jakub Warmuz
|
8c6d1ad50a
|
letsencrypt_nginx should not depend on letsencrypt_apache.
|
2015-06-02 14:28:20 +00:00 |
|
Jakub Warmuz
|
cd7a5ec24a
|
Fix pylint
|
2015-06-02 01:01:29 +00:00 |
|
Jakub Warmuz
|
8fed612fef
|
Fix apache/nginx tests.
|
2015-06-02 00:40:33 +00:00 |
|
Jakub Warmuz
|
8fe6584336
|
Don't allow user supplied mod_ssl conf destination (fixes #451).
|
2015-06-02 00:14:10 +00:00 |
|
Jakub Warmuz
|
3fefd28080
|
Only configure --config-dir/--work-dir (rest dynamic).
|
2015-06-01 23:49:07 +00:00 |
|
Jakub Warmuz
|
ae6c7cb936
|
--le-vhost-ext -> --apache-le-vhost-ext
|
2015-05-22 07:28:21 +00:00 |
|
Jakub Warmuz
|
bb94952830
|
Merge remote-tracking branch 'github/letsencrypt/master' into test-dirs-chmods
Conflicts:
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/foo.conf
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/nginx.conf
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/nginx.new.conf
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/server.conf
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/default
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/sites-enabled/example.com
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params
letsencrypt/client/plugins/nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf
letsencrypt/client/plugins/nginx/tests/testdata/foo.conf
letsencrypt/client/plugins/nginx/tests/testdata/nginx.conf
letsencrypt/client/plugins/nginx/tests/testdata/nginx.new.conf
letsencrypt/client/plugins/nginx/tests/testdata/server.conf
letsencrypt/client/plugins/nginx/tests/testdata/sites-enabled/default
letsencrypt/client/plugins/nginx/tests/testdata/sites-enabled/example.com
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params
letsencrypt/client/plugins/nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf
letsencrypt_apache/tests/util.py
letsencrypt_nginx/tests/testdata/foo.conf
letsencrypt_nginx/tests/testdata/nginx.conf
letsencrypt_nginx/tests/testdata/nginx.new.conf
letsencrypt_nginx/tests/testdata/server.conf
letsencrypt_nginx/tests/testdata/sites-enabled/default
letsencrypt_nginx/tests/testdata/sites-enabled/example.com
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/fastcgi_params
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-utf
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/koi-win
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/mime.types
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi-ui.conf.1.4.1
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi.rules
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/nginx.conf
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/proxy_params
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/scgi_params
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-available/default
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/sites-enabled/default
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/uwsgi_params
letsencrypt_nginx/tests/testdata/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf
letsencrypt_nginx/tests/util.py
|
2015-05-12 21:06:17 +00:00 |
|
Jakub Warmuz
|
d408ec5a95
|
Move plugins to top-level
|
2015-05-10 12:26:54 +00:00 |
|