1
0
mirror of https://github.com/certbot/certbot.git synced 2026-01-23 07:20:55 +03:00
Commit Graph

44 Commits

Author SHA1 Message Date
Jakub Warmuz
c85fa02495 Leave letsencrypt_ symlinks for Boulder integration testing. 2015-07-11 05:08:43 +00:00
Jakub Warmuz
120a94f84f mv letsencrypt_* letsencrypt-*. 2015-07-11 04:31:18 +00:00
Jakub Warmuz
b9df69af9f Basic dev/test setup for separate package subdirectories. 2015-07-10 16:38:42 +00:00
Jakub Warmuz
2f9cd68807 Move acme and plugins to respective subdirectories.
for x in acme letsencrypt_nginx letsencrypt_apache; do git mv $x _$x; mkdir $x; git mv _$x $x/$x; done
2015-07-10 16:18:15 +00:00
Jakub Warmuz
19c73249ca Sort vectors: acme/testdata, separate acme and letsencrypt. 2015-07-10 15:16:48 +00:00
Jakub Warmuz
3e2d1c8abc get_cert_file -> get_cert_path. 2015-07-09 10:51:21 +00:00
Jakub Warmuz
7dc64e0387 Rewrite acccounts and registration.
Save accounts to:

    /etc/letsencrypt/accounts/www.letsencrypt-dmeo.org/acme/new-reg/ \
    kuba.le.wtf@2015-07-04T14:04:10Z/ \
    {regr.json,meta.json,private_key.json}

Account now represents a combination of private key, Registration
Resource and client account metadata. `Account.id` based on the
account metadata (creation host and datetime). UI interface
(`cli._determine_account`) based on the `id`, and not on email as
previously.

Add `AccountStorage` interface and `AccountFileStorage`,
`AccountMemoryStorage` implementations (latter, in-memory, useful for
testing).

Create Account only after Registration Resource is received
(`register()` returns `Account`).

Allow `client.Client(..., acme=acme, ...)`: API client might reuse
acme.client.Client as returned by `register()`.

Move report_new_account to letsencrypt.account, client.Client.register
into client.register.

Use Registration.from_data acme API.

achallenges.AChallenge.key is now the `acme.jose.JWK`, not
`le_util.Key`. Plugins have to export PEM/DER as necessary
(c.f. `letsencrypt.plugins.common.Dvsni.get_key_path`)

Add --agree-tos, save --agree-eula to "args.eula". Prompt for EULA as
soon as client is launched, add prompt for TOS.

Remove unnecessary letsencrypt.network. Remove, now irrelevant,
`IConfig.account_keys_dir`.

Based on the draft from
https://github.com/letsencrypt/letsencrypt/pull/362#issuecomment-97946817.
2015-07-09 06:43:45 +00:00
James Kasten
d10186214b fix unittest 2015-06-26 16:07:39 -07:00
James Kasten
f99af51de3 Address comments 2015-06-26 14:47:03 -07:00
James Kasten
aea74f3c46 Change appropriate misconfiguration errors 2015-06-26 12:05:25 -07:00
James Kasten
93a9a8b268 ConfiguratorError -> PluginError 2015-06-26 09:29:40 -07:00
James Kasten
36161c306a update tests 2015-06-26 08:47:26 -07:00
James Kasten
fdfd395707 Merge branch 'master' into apache_failed_vhost
Conflicts:
	letsencrypt_apache/configurator.py
	letsencrypt_apache/dvsni.py
2015-06-26 08:29:37 -07:00
James Kasten
bda7c9f5ce refine vhost display 2015-06-25 18:57:10 -07:00
James Kasten
1973bdbc2f Merge branch 'master' into apache_failed_vhost 2015-06-25 17:03:22 -07:00
James Kasten
99fcb4f230 Handle missing vhosts gracefully 2015-06-25 17:02:09 -07:00
Jakub Warmuz
f080aae332 Merge remote-tracking branch 'github/letsencrypt/master' into logging 2015-06-25 21:11:46 +00:00
Jakub Warmuz
4ce4e2f930 logger = logging.getLogger(__name__) 2015-06-25 19:55:22 +00:00
Jakub Warmuz
3789922c0b Move AugeasConfigurator to letsencrypt_apache.
https://github.com/letsencrypt/lets-encrypt-preview/pull/531#issuecomment-114285541
2015-06-25 17:55:49 +00:00
James Kasten
b606bdf749 double quotes 2015-06-24 18:36:30 -07:00
James Kasten
04440179f4 Merge pull request #534 from kuba/440-no-cli
Dynamic dirs based on --config-dir and --work-dir (#440 without touching CLI)
2015-06-24 19:06:33 -04:00
Jakub Warmuz
8e582dfff8 Merge remote-tracking branch 'github/letsencrypt/master' into cli-config-fixes
Conflicts:
	letsencrypt/constants.py
2015-06-23 07:47:48 +00:00
Jakub Warmuz
57f67c4109 Rewrap after errors rename, doc fixes. 2015-06-22 22:43:42 +00:00
Jakub Warmuz
cfa7e28106 errors.LetsEncrypt -> errors. (fixes: #487) 2015-06-22 22:41:24 +00:00
Jakub Warmuz
8e39a3a0ef Collate multi-line logs, use logging.exception, other fixes. 2015-06-22 22:05:27 +00:00
Jakub Warmuz
061282fa66 Store temporary DVSNI files in IConfig.work_dir. 2015-06-20 21:32:24 +00:00
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
James Kasten
5dcac29e3b Merge pull request #474 from kuba/nginx-apache-split
letsencrypt_nginx should not depend on letsencrypt_apache.
2015-06-20 12:57:31 -04:00
Jakub Warmuz
7f5abba83e Rename SimpleHTTPS to SimpleHTTP. 2015-06-12 08:23:32 +00:00
Jakub Warmuz
196884652e Merge remote-tracking branch 'github/letsencrypt/master' into cli-config-fixes
Conflicts:
	letsencrypt_apache/constants.py
	letsencrypt_nginx/constants.py
2015-06-11 21:46:16 +00:00
Francois Marier
bce01419da Rename the apache config file to match the nginx one
Since both config files end up in /etc/letsencrypt/, if we want the two
plugins be to installable at the same time, their config files need different
names.
2015-06-07 20:31:50 +12:00
Jakub Warmuz
8c6d1ad50a letsencrypt_nginx should not depend on letsencrypt_apache. 2015-06-02 14:28:20 +00:00
Jakub Warmuz
9ecfecbc7a Add missing docstring. 2015-06-02 09:19:51 +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
5547d13f12 Merge branch 'renewer-cleanup' into cli-config-fixes-2
Conflicts:
	letsencrypt/cli.py
	letsencrypt/client.py
	letsencrypt/interfaces.py
2015-05-28 19:07:58 +00:00
Jakub Warmuz
d01b17f1e2 IInstaller.deploy_cert docs/naming fixes 2015-05-28 18:31:06 +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
b4c747a283 Merge branch 'bugs/402' into pkgs_sep_prep
Conflicts:
	letsencrypt/tests/client_test.py
	tox.ini
2015-05-10 17:56:41 +00:00
Jakub Warmuz
41e86df252 Move letsencrypt.client to letsencrypt 2015-05-10 12:32:05 +00:00
Jakub Warmuz
d408ec5a95 Move plugins to top-level 2015-05-10 12:26:54 +00:00