diff --git a/.travis.yml b/.travis.yml index d2171f4c..60399471 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,11 @@ script: - sudo ee site update site9.com --wpsubdomain --w3tc - sudo ee site update site9.com --wpsubdomain --wpsc + - sudo ee site create www.site-1.com --wp + - sudo ee site create www.subsite.site-1.com --wpfc + - sudo ee site update www.subsite.site-1.com --wp + - sudo ee site delete www.subsite.site-1.com --all --no-prompt + - sudo ee site delete site12.in --all --no-prompt - sudo ee site delete site12.net --no-prompt - sudo ee site delete site12.org --no-prompt diff --git a/ee/cli/plugins/secure.py b/ee/cli/plugins/secure.py index c7007bb9..09df15f2 100644 --- a/ee/cli/plugins/secure.py +++ b/ee/cli/plugins/secure.py @@ -4,6 +4,7 @@ from ee.core.shellexec import EEShellExec from ee.core.variables import EEVariables from ee.core.logging import Log from ee.core.git import EEGit +from ee.core.services import EEService import string import random import sys @@ -103,7 +104,7 @@ class EESecureController(CementBaseController): .format(port=self.app.pargs.user_input)) EEGit.add(self, ["/etc/nginx"], msg="Adding changed secure port into Git") - + EEService.reload_service(self, 'nginx') Log.info(self, "Successfully port changed {port}" .format(port=self.app.pargs.user_input)) diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index 1d3cbaa5..8e86dfb6 100644 --- a/ee/cli/plugins/site.py +++ b/ee/cli/plugins/site.py @@ -522,7 +522,7 @@ class EESiteCreateController(CementBaseController): .format(ee_wp_creds['wp_pass']), log=False) display_cache_settings(self, data) - addNewSite(self, ee_www_domain, stype, cache, ee_site_webroot) + addNewSite(self, ee_domain, stype, cache, ee_site_webroot) Log.info(self, "Successfully created site" " http://{0}".format(ee_domain)) @@ -982,7 +982,7 @@ class EESiteUpdateController(CementBaseController): " {0}".format(ee_wp_creds['wp_user'])) Log.info(self, Log.ENDC + "WordPress admin password : {0}" .format(ee_wp_creds['wp_pass']) + "\n\n") - updateSiteInfo(self, ee_www_domain, stype=stype, cache=cache) + updateSiteInfo(self, ee_domain, stype=stype, cache=cache) Log.info(self, "Successfully updated site" " http://{0}".format(ee_domain)) @@ -1071,6 +1071,8 @@ class EESiteDeleteController(CementBaseController): if (ee_nginx_prompt == 'Y' or ee_nginx_prompt == 'y'): Log.debug(self, "Removing Nginx configuration") + EEFileUtils.rm(self, '/etc/nginx/sites-enabled/{0}' + .format(ee_domain)) EEFileUtils.rm(self, '/etc/nginx/sites-available/{0}' .format(ee_domain)) EEGit.add(self, ["/etc/nginx"], diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 49f04a53..e0a24349 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -90,25 +90,25 @@ class EEStackController(CementBaseController): 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, '1C4CBDCDCD2EFD2A', + 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 \"percona-server-server-5.6 " - "percona-server-server/root_password " + Log.debug(self, "echo \"mariadb-server-10.0 " + "mysql-server/root_password " "password \" | " "debconf-set-selections") - EEShellExec.cmd_exec(self, "echo \"percona-server-server-5.6 " - "percona-server-server/root_password " + EEShellExec.cmd_exec(self, "echo \"mariadb-server-10.0 " + "mysql-server/root_password " "password {chars}\" | " "debconf-set-selections".format(chars=chars), log=False) - Log.debug(self, "echo \"percona-server-server-5.6 " - "percona-server-server/root_password_again " + Log.debug(self, "echo \"mariadb-server-10.0 " + "mysql-server/root_password_again " "password \" | " "debconf-set-selections") - EEShellExec.cmd_exec(self, "echo \"percona-server-server-5.6 " - "percona-server-server/root_password_again " + EEShellExec.cmd_exec(self, "echo \"mariadb-server-10.0 " + "mysql-server/root_password_again " "password {chars}\" | " "debconf-set-selections".format(chars=chars), log=False) diff --git a/ee/core/variables.py b/ee/core/variables.py index 6df38377..53689112 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -78,9 +78,6 @@ class EEVariables(): # PHP repo and packages if ee_platform_distro == 'Ubuntu': ee_php_repo = "ppa:ondrej/php5" - elif ee_platform_codename == 'squeeze': - ee_php_repo = ("deb http://packages.dotdeb.org {codename}-php54 all" - .format(codename=ee_platform_codename)) elif ee_platform_codename == 'wheezy': ee_php_repo = ("deb http://packages.dotdeb.org {codename}-php55 all" .format(codename=ee_platform_codename)) @@ -90,9 +87,15 @@ class EEVariables(): "graphviz"] # 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", "mysqltuner", "percona-toolkit"] + if ee_platform_distro == 'Ubuntu': + ee_mysql_repo = ("deb http://mirror.aarnet.edu.au/pub/MariaDB/repo/" + "10.0/ubuntu {codename} main" + .format(codename=ee_platform_codename)) + elif ee_platform_distro == 'debian': + 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"] # Postfix repo and packages ee_postfix_repo = ""