diff --git a/tests/travis.sh b/tests/travis.sh index d1ac05b..f42efdf 100644 --- a/tests/travis.sh +++ b/tests/travis.sh @@ -28,7 +28,7 @@ exit_script() { echo -e "${CGREEN}#############################################${CEND}" echo -e ' stack install ' echo -e "${CGREEN}#############################################${CEND}" -stack_list='nginx php php73 mysql redis fail2ban clamav proftpd netdata phpmyadmin composer dashboard extplorer adminer redis phpredisadmin mysqltuner utils ufw ngxblocker cheat nanorc' +stack_list='nginx php php73 mysql redis fail2ban clamav proftpd netdata phpmyadmin composer dashboard extplorer adminer redis phpredisadmin mysqltuner utils ufw ngxblocker cheat' for stack in $stack_list; do echo -ne " Installing $stack [..]\r" if { diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index 7ecf00a..4f5dab5 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -309,7 +309,7 @@ class WOStackController(CementBaseController): Log.debug(self, "phpMyAdmin already installed") Log.info(self, "phpMyAdmin already installed") - # PHPREDISADMIN + # PHPREDISADMIN if pargs.phpredisadmin: pargs.composer = True if not os.path.isdir('/var/www/22222/htdocs/' @@ -328,8 +328,7 @@ class WOStackController(CementBaseController): # Composer if pargs.composer: - if ((not WOAptGet.is_installed(self, 'php7.2-fpm')) and - (not WOAptGet.is_installed(self, 'php7.3-fpm'))): + if not WOShellExec.cmd_exec(self, 'php -v'): pargs.php = True if not os.path.isfile('/usr/local/bin/composer'): Log.debug(self, "Setting packages variable for Composer ") diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index bedc70d..376ca29 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -162,7 +162,7 @@ def pre_pref(self, apt_packages): self, '/etc/apt/sources.list/wo-repo.list', 'download.opensuse.org'): Log.info(self, "Adding repository for Redis, please wait...") - WORepo.add(self, repo_url=WOVar.wo_php_repo) + WORepo.add(self, repo_url=WOVar.wo_nginx_repo) WORepo.add_key(self, WOVar.wo_nginx_key) # nano @@ -171,6 +171,7 @@ def pre_pref(self, apt_packages): if (WOVar.wo_platform_codename == 'bionic' or WOVar.wo_platform_codename == 'xenial'): if not os.path.exists( + '/etc/apt/sources.list.d/' 'jonathonf-ubuntu-backports-{0}.list' .format(WOVar.wo_platform_codename)): Log.debug(self, 'Adding ppa for nano')