diff options
| author | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-05 09:58:03 +0200 |
|---|---|---|
| committer | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-05 09:58:03 +0200 |
| commit | 46fb580fa0131f6815bbcfc95631654f6fe999a8 (patch) | |
| tree | 73ae9fcaa97d5cfab7883bc6fbf3ea036677c2a3 /src/conf_mode/le_cert.py | |
| parent | 0377b8e40b0d3e424da11194e97659c5066c0a1d (diff) | |
| parent | b6b61bc9ecf1328e67a0c15934f8bf3966a6b66d (diff) | |
| download | vyos-1x-46fb580fa0131f6815bbcfc95631654f6fe999a8.tar.gz vyos-1x-46fb580fa0131f6815bbcfc95631654f6fe999a8.zip | |
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to 'src/conf_mode/le_cert.py')
| -rwxr-xr-x | src/conf_mode/le_cert.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/conf_mode/le_cert.py b/src/conf_mode/le_cert.py index 5b965f95f..755c89966 100755 --- a/src/conf_mode/le_cert.py +++ b/src/conf_mode/le_cert.py @@ -27,6 +27,7 @@ from vyos import airbag airbag.enable() vyos_conf_scripts_dir = vyos.defaults.directories['conf_mode'] +vyos_certbot_dir = vyos.defaults.directories['certbot'] dependencies = [ 'https.py', @@ -45,7 +46,7 @@ def request_certbot(cert): else: domain_flag = '' - certbot_cmd = 'certbot certonly -n --nginx --agree-tos --no-eff-email --expand {0} {1}'.format(email_flag, domain_flag) + certbot_cmd = f'certbot certonly --config-dir {vyos_certbot_dir} -n --nginx --agree-tos --no-eff-email --expand {email_flag} {domain_flag}' cmd(certbot_cmd, raising=ConfigError, |