Browse Source

Merge branch 'python' of github.com:rtCamp/easyengine into python

bugfixes
harshadyeola 10 years ago
parent
commit
ec8ed8de25
  1. 2
      ee/cli/plugins/import_slow_log.py
  2. 6
      ee/cli/plugins/stack.py
  3. 4
      ee/core/services.py
  4. 2
      ee/core/variables.py

2
ee/cli/plugins/import_slow_log.py

@ -24,7 +24,7 @@ class EEImportslowlogController(CementBaseController):
.format(EEVariables.ee_webroot)):
if os.path.isfile("/var/log/mysql/mysql-slow.log"):
# Get Anemometer user name and password
Log.error(self, "Importing MySQL slow log to Anemometer")
Log.info(self, "Importing MySQL slow log to Anemometer")
host = os.popen("grep -e \"\'host\'\" {0}22222/htdocs/"
.format(EEVariables.ee_webroot)
+ "db/anemometer/conf/config.inc.php "

6
ee/cli/plugins/stack.py

@ -640,7 +640,7 @@ class EEStackController(CementBaseController):
"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 @@ class EEStackController(CementBaseController):
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):

4
ee/core/services.py

@ -103,8 +103,8 @@ class EEService():
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+"]")

2
ee/core/variables.py

@ -92,7 +92,7 @@ class EEVariables():
# MySQL repo and packages
ee_mysql_repo = ("deb http://repo.percona.com/apt {codename} main"
.format(codename=ee_platform_codename))
ee_mysql = ["percona-server-server-5.6"]
ee_mysql = ["percona-server-server-5.6", "mysqltuner", "percona-toolkit"]
# Postfix repo and packages
ee_postfix_repo = ""

Loading…
Cancel
Save