Merge pull request #4820 from c-po/certbot-fixes

pki: T7953: implement certbot_renew() function to have everything at one place

1 files changed, 8 insertions, 13 deletions

diff --git a/src/op_mode/pki.py b/src/op_mode/pki.py
index 7ee51a1ae..b84b6f02a 100755
--- a/src/op_mode/pki.py
+++ b/src/op_mode/pki.py
@@ -1378,7 +1378,7 @@ def renew_certbot(raw: bool, force: typing.Optional[bool] = False):
     from vyos.defaults import directories
 
     certbot_config = directories['certbot']
-    hook_dir = directories['base']
+    vyos_conf_scripts_dir = directories['conf_mode']
 
     if force and not os.path.isdir(f'{certbot_config}'):
         # Assume someone deleted the certbot_config folder, renew alone will not
@@ -1388,18 +1388,13 @@ def renew_certbot(raw: bool, force: typing.Optional[bool] = False):
         # a bad time
         Warning(f'Directory "{certbot_config}" missing. Reinitializing PKI ' \
                 'subsystem...\n\n')
-        vyos_conf_scripts_dir = directories['conf_mode']
-        cmd(f'sudo sg vyattacfg -c {vyos_conf_scripts_dir}/pki.py')
-
-    tmp = f'/usr/bin/certbot renew --no-random-sleep-on-renew ' \
-          f'--config-dir "{certbot_config}" ' \
-          f'--post-hook "{hook_dir}/vyos-certbot-renew-pki.sh"'
-    if force:
-        tmp += ' --force-renewal'
-
-    out = cmd(tmp)
-    if not raw:
-        print(out)
+        out = cmd(f'sudo sg vyattacfg -c "{vyos_conf_scripts_dir}/pki.py"')
+    elif force:
+        out = cmd(f'sudo sg vyattacfg -c "{vyos_conf_scripts_dir}/pki.py certbot_renew_force"')
+    else:
+        out = cmd(f'sudo sg vyattacfg -c "{vyos_conf_scripts_dir}/pki.py certbot_renew"')
+
+    print(out)
 
 if __name__ == '__main__':
     try: