From c3b21f4470f987d274d29cd07dbddfb9c40599b9 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Mon, 14 Dec 2015 19:36:29 +0530 Subject: [PATCH] update setupletsencrypt() functn --- ee/cli/plugins/site_functions.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 4ef1e186..b247071f 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -1198,7 +1198,6 @@ def cloneLetsEncrypt(self): return False def setupLetsEncrypt(self, ee_domain_name): - #ee_domain_name = data['site_name'] ee_wp_email = EEVariables.ee_email while not ee_wp_email: try: @@ -1213,7 +1212,7 @@ def setupLetsEncrypt(self, ee_domain_name): ssl = EEShellExec.cmd_exec(self, "./letsencrypt-auto certonly --webroot -w /var/www/{0}/htdocs/ -d {0} -d www.{0} " .format(ee_domain_name) + "--email {0} --text --agree-tos".format(ee_wp_email)) - + ssl = True if ssl: Log.info(self, "Letsencrypt succesfully configured for your site") Log.info(self, "configuring nginx config") @@ -1228,7 +1227,11 @@ def setupLetsEncrypt(self, ee_domain_name): "ssl_certificate_key /etc/letsencrypt/live/{0}/privkey.pem;\n" .format(ee_domain_name)) sslconf.close() - EEService.reload_service(self, 'nginx') + # updateSiteInfo(self, ee_domain_name, ssl=True) + + EEGit.add(self, ["/etc/letsencrypt"], + msg="Adding letsencrypt folder") + except IOError as e: Log.debug(self, str(e)) Log.debug(self, "Error occured while generating "