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

Update Nanorc

Browse Source
This commit is contained in:
VirtuBox
2019-11-05 17:37:42 +01:00
parent e4daf59803
commit a96baa05f4
2 changed files with 39 additions and 4 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' stack_list='nginx php php73 mysql redis fail2ban clamav proftpd netdata phpmyadmin composer dashboard extplorer adminer redis phpredisadmin mysqltuner utils ufw ngxblocker cheat nanorc'
for stack in $stack_list; do for stack in $stack_list; do
echo -ne " Installing $stack [..]\r" echo -ne " Installing $stack [..]\r"
if { if {

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

@@ -674,7 +674,14 @@ class WOStackController(CementBaseController):
if pargs.ufw: if pargs.ufw:
if WOAptGet.is_installed(self, 'ufw'): if WOAptGet.is_installed(self, 'ufw'):
Log.debug(self, "Remove apt_packages variable for UFW") Log.debug(self, "Remove apt_packages variable for UFW")
apt_packages = apt_packages + ["ufw"] WOShellExec.cmd_exec(self, 'ufw disable && ufw --force reset')
# nanorc
if pargs.nanorc:
if os.path.exists('/usr/share/nano-syntax-highlighting'):
Log.debug(self, "Add nano to apt_packages list")
packages = packages + \
["/usr/share/nano-syntax-highlighting"]
# WPCLI # WPCLI
if pargs.wpcli: if pargs.wpcli:
@@ -804,6 +811,16 @@ class WOStackController(CementBaseController):
Log.wait(self, "Removing packages ") Log.wait(self, "Removing packages ")
WOFileUtils.remove(self, packages) WOFileUtils.remove(self, packages)
Log.valide(self, "Removing packages ") Log.valide(self, "Removing packages ")
if '/usr/share/nano-syntax-highlighting' in packages:
# removing include line from nanorc
WOShellExec.cmd_exec(
self, 'grep -v "nano-syntax-highlighting" '
'/etc/nanorc > /etc/nanorc.new')
WOFileUtils.rm(self, '/etc/nanorc')
WOFileUtils.mvfile(
self, '/etc/nanorc.new', '/etc/nanorc')
if (apt_packages): if (apt_packages):
Log.debug(self, "Removing apt_packages") Log.debug(self, "Removing apt_packages")
Log.wait(self, "Removing APT packages ") Log.wait(self, "Removing APT packages ")
@@ -811,6 +828,8 @@ class WOStackController(CementBaseController):
WOAptGet.auto_remove(self) WOAptGet.auto_remove(self)
Log.valide(self, "Removing APT packages ") Log.valide(self, "Removing APT packages ")
Log.info(self, "Successfully removed packages") Log.info(self, "Successfully removed packages")
@expose(help="Purge packages") @expose(help="Purge packages")
@@ -937,7 +956,7 @@ class WOStackController(CementBaseController):
if pargs.ufw: if pargs.ufw:
if WOAptGet.is_installed(self, 'ufw'): if WOAptGet.is_installed(self, 'ufw'):
Log.debug(self, "Add UFW to apt_packages list") Log.debug(self, "Add UFW to apt_packages list")
apt_packages = apt_packages + ["ufw"] WOShellExec.cmd_exec(self, 'ufw disable && ufw --force reset')
# sendmail # sendmail
if pargs.sendmail: if pargs.sendmail:
@@ -951,6 +970,13 @@ class WOStackController(CementBaseController):
Log.debug(self, "Add Proftpd to apt_packages list") Log.debug(self, "Add Proftpd to apt_packages list")
apt_packages = apt_packages + ["proftpd-basic"] apt_packages = apt_packages + ["proftpd-basic"]
# nanorc
if pargs.nanorc:
if os.path.exists('/usr/share/nano-syntax-highlighting'):
Log.debug(self, "Add nano to apt_packages list")
packages = packages + \
["/usr/share/nano-syntax-highlighting"]
# WP-CLI # WP-CLI
if pargs.wpcli: if pargs.wpcli:
if os.path.isfile('/usr/local/bin/wp'): if os.path.isfile('/usr/local/bin/wp'):
@@ -1080,11 +1106,20 @@ class WOStackController(CementBaseController):
WOAptGet.remove(self, apt_packages, purge=True) WOAptGet.remove(self, apt_packages, purge=True)
WOAptGet.auto_remove(self) WOAptGet.auto_remove(self)
Log.valide(self, "Purging APT Packages ") Log.valide(self, "Purging APT Packages ")
if (packages): if (packages):
Log.wait(self, "Purging Packages ") Log.wait(self, "Purging Packages ")
WOFileUtils.remove(self, packages) WOFileUtils.remove(self, packages)
Log.valide(self, "Purging Packages ") Log.valide(self, "Purging Packages ")
if '/usr/share/nano-syntax-highlighting' in packages:
# removing include line from nanorc
WOShellExec.cmd_exec(
self, 'grep -v "nano-syntax-highlighting" '
'/etc/nanorc > /etc/nanorc.new')
WOFileUtils.rm(self, '/etc/nanorc')
WOFileUtils.mvfile(
self, '/etc/nanorc.new', '/etc/nanorc')
Log.info(self, "Successfully purged packages") Log.info(self, "Successfully purged packages")