Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix small errors, and remove nanorc from travis

Browse Source
This commit is contained in:
VirtuBox
2019-11-02 18:15:17 +01:00
parent 8df0391cab
commit 8be23bba38
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/travis.sh
View File

@@ -28,7 +28,7 @@ exit_script() {
echo -e "${CGREEN}#############################################${CEND}" echo -e "${CGREEN}#############################################${CEND}"
echo -e ' stack install ' echo -e ' stack install '
echo -e "${CGREEN}#############################################${CEND}" 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 for stack in $stack_list; do
echo -ne " Installing $stack [..]\r" echo -ne " Installing $stack [..]\r"
if { if {

5
wo/cli/plugins/stack.py
View File

@@ -309,7 +309,7 @@ class WOStackController(CementBaseController):
Log.debug(self, "phpMyAdmin already installed") Log.debug(self, "phpMyAdmin already installed")
Log.info(self, "phpMyAdmin already installed") Log.info(self, "phpMyAdmin already installed")
# PHPREDISADMIN # PHPREDISADMIN
if pargs.phpredisadmin: if pargs.phpredisadmin:
pargs.composer = True pargs.composer = True
if not os.path.isdir('/var/www/22222/htdocs/' if not os.path.isdir('/var/www/22222/htdocs/'
@@ -328,8 +328,7 @@ class WOStackController(CementBaseController):
# Composer # Composer
if pargs.composer: if pargs.composer:
if ((not WOAptGet.is_installed(self, 'php7.2-fpm')) and if not WOShellExec.cmd_exec(self, 'php -v'):
(not WOAptGet.is_installed(self, 'php7.3-fpm'))):
pargs.php = True pargs.php = True
if not os.path.isfile('/usr/local/bin/composer'): if not os.path.isfile('/usr/local/bin/composer'):
Log.debug(self, "Setting packages variable for Composer ") Log.debug(self, "Setting packages variable for Composer ")

3
wo/cli/plugins/stack_pref.py
View File

@@ -162,7 +162,7 @@ def pre_pref(self, apt_packages):
self, '/etc/apt/sources.list/wo-repo.list', self, '/etc/apt/sources.list/wo-repo.list',
'download.opensuse.org'): 'download.opensuse.org'):
Log.info(self, "Adding repository for Redis, please wait...") 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) WORepo.add_key(self, WOVar.wo_nginx_key)
# nano # nano
@@ -171,6 +171,7 @@ def pre_pref(self, apt_packages):
if (WOVar.wo_platform_codename == 'bionic' or if (WOVar.wo_platform_codename == 'bionic' or
WOVar.wo_platform_codename == 'xenial'): WOVar.wo_platform_codename == 'xenial'):
if not os.path.exists( if not os.path.exists(
'/etc/apt/sources.list.d/'
'jonathonf-ubuntu-backports-{0}.list' 'jonathonf-ubuntu-backports-{0}.list'
.format(WOVar.wo_platform_codename)): .format(WOVar.wo_platform_codename)):
Log.debug(self, 'Adding ppa for nano') Log.debug(self, 'Adding ppa for nano')