added hhtps redirct

ee/cli/plugins/site.py

@@ -747,6 +747,7 @@ class EESiteCreateController(CementBaseController):
 
             if data['letsencrypt'] is True:
                  setupLetsEncrypt(self, ee_domain)
+                 httpsRedirect(self,ee_domain)
 
                  if not EEService.reload_service(self, 'nginx'):
                     Log.error(self, "service nginx reload failed. "
@@ -767,7 +768,7 @@ class EESiteCreateController(CementBaseController):
                  updateSiteInfo(self, ee_domain, ssl=letsencrypt)
 
             elif data['letsencrypt'] is False:
-                Log.info(self, "Not using Let's encrypt for Site "
+                Log.info(self, "Not using Let\'s encrypt for Site "
                          " http://{0}".format(ee_domain))
 
 
@@ -1275,13 +1276,14 @@ class EESiteUpdateController(CementBaseController):
                               .format(ee_site_webroot)):
                     setupLetsEncrypt(self, ee_domain)
 
-                    # return 0
                 else:
                     EEFileUtils.mvfile(self, "{0}/conf/nginx/ssl.conf.disabled"
                                .format(ee_site_webroot),
                                '{0}/conf/nginx/ssl.conf'
                                .format(ee_site_webroot))
 
+                httpsRedirect(self,ee_domain)
+
                 if not EEService.reload_service(self, 'nginx'):
                         Log.error(self, "service nginx reload failed. "
                           "check issues with `nginx -t` command")
@@ -1302,6 +1304,7 @@ class EESiteUpdateController(CementBaseController):
                                   .format(ee_site_webroot),
                                   '{0}/conf/nginx/ssl.conf.disabled'
                                   .format(ee_site_webroot))
+                        httpsRedirect(self,ee_domain,False)
                         if not EEService.reload_service(self, 'nginx'):
                             Log.error(self, "service nginx reload failed. "
                                  "check issues with `nginx -t` command")

ee/cli/plugins/site_functions.py

@@ -1306,16 +1306,16 @@ def httpsRedirect(self,ee_domain_name,redirect=True):
                 Log.debug(self, str(e))
                 Log.debug(self, "Error occured while generating "
                               "/etc/nginx/conf.d/force-ssl-{0}.conf".format(ee_domain_name))
+
+        Log.info(self, "Added HTTPS Force Redirection for Site "
+                         " http://{0}".format(ee_domain_name))
         EEGit.add(self,
                   ["/etc/nginx"], msg="Adding /etc/nginx/conf.d/force-ssl-{0}.conf".format(ee_domain_name))
     else:
         if os.path.isfile("/etc/nginx/conf.d/force-ssl-{0}.conf".format(ee_domain_name)):
              EEFileUtils.mvfile(self, "/etc/nginx/conf.d/force-ssl-{0}.conf".format(ee_domain_name),
                                   "/etc/nginx/conf.d/force-ssl-{0}.conf.disabled".format(ee_domain_name))
-             if not EEService.reload_service(self, 'nginx'):
+             Log.info(self, "Disabled HTTPS Force Redirection for Site "
-                 Log.error(self, "service nginx reload failed. "
-                                 "check issues with `nginx -t` command")
-             Log.info(self, "Successfully Disabled HTTPS Force Redirection for Site "
                          " http://{0}".format(ee_domain_name))