From 05acb9d589f9b3337335aaed4a31166e14826b89 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Mon, 11 May 2015 19:01:43 +0530 Subject: [PATCH] updated php5-xdebug install method on jessie and removed mysqltuner package from mysql stack --- ee/cli/plugins/stack.py | 14 ++++++++------ ee/core/variables.py | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 5d242489..b2907bf1 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -102,11 +102,12 @@ class EEStackController(CementBaseController): with open('/etc/apt/preferences.d/' 'MariaDB.pref', 'w') as mysql_pref_file: mysql_pref_file.write(mysql_pref) - EERepo.add(self, repo_url=EEVariables.ee_mysql_repo) - Log.debug(self, 'Adding key for {0}' - .format(EEVariables.ee_mysql_repo)) - EERepo.add_key(self, '0xcbcb082a1bb943db', - keyserver="keyserver.ubuntu.com") + if EEVariables.ee_platform_codename != 'jessie': + EERepo.add(self, repo_url=EEVariables.ee_mysql_repo) + Log.debug(self, 'Adding key for {0}' + .format(EEVariables.ee_mysql_repo)) + EERepo.add_key(self, '0xcbcb082a1bb943db', + keyserver="keyserver.ubuntu.com") chars = ''.join(random.sample(string.ascii_letters, 8)) Log.debug(self, "Pre-seeding MySQL") Log.debug(self, "echo \"mariadb-server-10.0 " @@ -479,7 +480,8 @@ class EEStackController(CementBaseController): # For debian install xdebug - if EEVariables.ee_platform_distro == "debian": + if (EEVariables.ee_platform_distro == "debian" and + EEVariables.ee_platform_distro == 'wheezy'): EEShellExec.cmd_exec(self, "pecl install xdebug") with open("/etc/php5/mods-available/xdebug.ini", diff --git a/ee/core/variables.py b/ee/core/variables.py index 7c4cb57f..b3dbc1e3 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -95,7 +95,7 @@ class EEVariables(): "php5-mysql", "php5-cli", "php5-memcache", "php5-imagick", "memcached", "graphviz", "php-pear", "php5-dev"] - if ee_platform_distro == 'Ubuntu': + if ee_platform_distro == 'Ubuntu' or ee_platform_codename == 'jessie': ee_php = ee_php + ["php5-xdebug"] # MySQL repo and packages @@ -107,7 +107,7 @@ class EEVariables(): ee_mysql_repo = ("deb http://mirror.aarnet.edu.au/pub/MariaDB/repo/" "10.0/debian {codename} main" .format(codename=ee_platform_codename)) - ee_mysql = ["mariadb-server", "mysqltuner", "percona-toolkit"] + ee_mysql = (["mariadb-server", "percona-toolkit"]) # Postfix repo and packages ee_postfix_repo = ""