Fixed bug of amavis in stack.py

Author: shital.rtcamp

ee/cli/plugins/stack.py

@@ -640,7 +640,7 @@ def post_pref(self, apt_packages, packages):
                                      "smtp-amavis:[127.0.0.1]:10024\"")
                 EEShellExec.cmd_exec(self, "sed -i \"s/1       pickup/1       "
                                      "pickup"
-                                     "\n        -o content_filter=\n        -o"
+                                     "\\n        -o content_filter=\\n        -o"
                                      " receive_override_options=no_header_body"
                                      "_checks/\" /etc/postfix/master.cf")
 
@@ -657,10 +657,10 @@ def post_pref(self, apt_packages, packages):
                 EEShellExec.cmd_exec(self, "freshclam")
                 Log.debug(self, "Restarting clamav-daemon service")
                 EEShellExec.cmd_exec(self, "service clamav-daemon restart")
-                EEGit.add(self, ["/etc/amavis"], msg="Adding Amvis into Git")
+                EEGit.add(self, ["/etc/amavis"], msg="Adding Amavis into Git")
                 EEService.restart_service(self, 'dovecot')
                 EEService.reload_service(self, 'postfix')
-                EEService.reload_service(self, 'amavis')
+                EEService.restart_service(self, 'amavis')
 
         if len(packages):
             if any('/usr/bin/wp' == x[1] for x in packages):

ee/core/services.py

@@ -103,8 +103,8 @@ def reload_service(self, service_name):
             retcode = subprocess.getstatusoutput('service {0} reload'
                                                  .format(service_name))
             if retcode[0] == 0:
-                Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]")
-                return True
+                    Log.info(self, "[" + Log.ENDC + "OK" + Log.OKBLUE + "]")
+                    return True
             else:
                 Log.debug(self, "{0}".format(retcode[1]))
                 Log.info(self, "[" + Log.FAIL + "Failed" + Log.OKBLUE+"]")