diff --git a/.travis.yml b/.travis.yml index b129a9a..4398eed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,6 @@ notifications: webhooks: secure: "JiGtzYplTyFg/L6Rsi7ptEQIV29O5qCWU2Zf5pLITsQrBrQO4cIXXp9G4Z+cenXjfIiqbqIgU0US3zXeIAl4g14xdfzmMYeMMwuKBpI8afMYv8MD6ldoP0MTFHQfROE6OXxKLVUvZn1R0oLLU1fzVSI0qGjNkt20cf/Lrt/reH/zS5hAI92kWI3u2zPu7Zn/g/a8MO/Y3Iv7v1PSQaVkVJVqtOK3U2GJqhIv2G1AVcaPb7Nh/V2zm2dDYBVT0UotBnlBUcUXbEMP77D9pjtWXd1/0rWuJIHixMjwUybpZqY75UMee5INynU6OZRsv029LRHAIMkWhfBkdVN/U5jhQJzui14+vRQrb5nfUMG8Cd8INojDlu6dk/ps2GzTCCXBITeMQKAouUoHD2LEbsNp17xi1K4ZlKb3+0lrOAiS4JYFE6wOo4yMlLTYoquYSqk7AuxuUS8A5OD5MYxhk9uafiTSxKFOo39KYWTSaACsPD8q1swaTSjoYm9skyZvIkIFq5bHBCYEGFe6X/NY9l5tz3hSe+TJOerCHsg+dXVuQl+pIp5nw2as9TH9ox5Vgqc9Zh4GbTDQVvdAmUpmlsZ/SKoOMCkmkB1aRNFq/7RnERIJyAEGJbauHWmjtOM4cCxesl0L0b2Eab89zQpSn7pzE8JTiJgpzCUc22p653PTaqM=" -addons: - apt: - update: true - git: quiet: true @@ -23,7 +19,6 @@ before_script: - unset LANG - sudo apt-get update --allow-releaseinfo-change -qq - sudo apt-get -qq purge mysql* graphviz* redis* - - sudo apt-get install -qq git python3-setuptools python3-dev python3-apt ccze tree - sudo apt-get -qq autoremove --purge diff --git a/CHANGELOG.md b/CHANGELOG.md index 255458e..b948351 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### v3.9.x - [Unreleased] +#### Added + +- WordOps install is now installed with pip from PyPi (easier, cleaner and safer) inside a wheel + #### Changed -- WordOps install is now handled with pip - Sysctl tweaks are applied during stack install and removed from install script - Nginx systemd tweaks during Nginx install/upgrade and removed from install script +- Initial creation of .gitconfig is displayed the first time you run the command `wo` + +#### Fixed + +- Incorrect PHP-FPM log path is `wo log` ### v3.9.9.4 - 2019-10-18 diff --git a/install b/install index 3acda2d..8e54d15 100755 --- a/install +++ b/install @@ -423,7 +423,7 @@ wo_install_acme_sh() { wo_install() { python3 -m pip install --upgrade wordops - cp -rn /usr/local/lib/python3.*/dist-packages/usr/* /usr/ + cp -rf /usr/local/lib/python3.*/dist-packages/usr/* /usr/ cp -rn /usr/local/lib/python3.*/dist-packages/etc/* /etc/ } diff --git a/wo/cli/plugins/log.py b/wo/cli/plugins/log.py index 68f9974..54b23de 100644 --- a/wo/cli/plugins/log.py +++ b/wo/cli/plugins/log.py @@ -46,7 +46,7 @@ class WOLogShowController(CementBaseController): (['--php'], dict(help='Show PHP Error logs file', action='store_true')), (['--fpm'], - dict(help='Show PHP5-fpm slow logs file', + dict(help='Show PHP-FPM slow logs file', action='store_true')), (['--mysql'], dict(help='Show MySQL logs file', action='store_true')), @@ -92,10 +92,10 @@ class WOLogShowController(CementBaseController): self.msg = self.msg + ["/var/log/nginx/*access.log"] if self.app.pargs.fpm: - open('/var/log/php5/slow.log', 'a').close() - open('/var/log/php5/fpm.log', 'a').close() - self.msg = self.msg + ['/var/log/php5/slow.log', - '/var/log/php5/fpm.log'] + open('/var/log/php/7.2/slow.log', 'a').close() + open('/var/log/php7.2-fpm.log', 'a').close() + self.msg = self.msg + ['/var/log/php/7.2/slow.log', + '/var/log/php7.2-fpm.log'] if self.app.pargs.mysql: # MySQL debug will not work for remote MySQL if WOVar.wo_mysql_host == "localhost": @@ -171,7 +171,7 @@ class WOLogResetController(CementBaseController): (['--php'], dict(help='Reset PHP Error logs file', action='store_true')), (['--fpm'], - dict(help='Reset PHP5-fpm slow logs file', + dict(help='Reset PHP-FPM slow logs file', action='store_true')), (['--mysql'], dict(help='Reset MySQL logs file', action='store_true')), @@ -231,10 +231,10 @@ class WOLogResetController(CementBaseController): self.msg = self.msg + ["/var/log/nginx/*access.log"] if self.app.pargs.fpm: - open('/var/log/php5/slow.log', 'a').close() - open('/var/log/php5/fpm.log', 'a').close() - self.msg = self.msg + ['/var/log/php5/slow.log', - '/var/log/php5/fpm.log'] + open('/var/log/php/7.2/slow.log', 'a').close() + open('/var/log/php7.2-fpm.log', 'a').close() + self.msg = self.msg + ['/var/log/php/7.2/slow.log', + '/var/log/php7.2-fpm.log'] if self.app.pargs.mysql: # MySQL debug will not work for remote MySQL if WOVar.wo_mysql_host == "localhost": @@ -313,7 +313,7 @@ class WOLogGzipController(CementBaseController): (['--php'], dict(help='GZip PHP Error logs file', action='store_true')), (['--fpm'], - dict(help='GZip PHP5-fpm slow logs file', + dict(help='GZip PHP-FPM slow logs file', action='store_true')), (['--mysql'], dict(help='GZip MySQL logs file', action='store_true')), @@ -359,10 +359,10 @@ class WOLogGzipController(CementBaseController): self.msg = self.msg + ["/var/log/nginx/*access.log"] if self.app.pargs.fpm: - open('/var/log/php5/slow.log', 'a').close() - open('/var/log/php5/fpm.log', 'a').close() - self.msg = self.msg + ['/var/log/php5/slow.log', - '/var/log/php5/fpm.log'] + open('/var/log/php/7.2/slow.log', 'a').close() + open('/var/log/php7.2-fpm.log', 'a').close() + self.msg = self.msg + ['/var/log/php/7.2/slow.log', + '/var/log/php7.2-fpm.log'] if self.app.pargs.mysql: # MySQL debug will not work for remote MySQL if WOVar.wo_mysql_host == "localhost": @@ -497,10 +497,10 @@ class WOLogMailController(CementBaseController): self.msg = self.msg + ["/var/log/nginx/*access.log"] if self.app.pargs.fpm: - open('/var/log/php5/slow.log', 'a').close() - open('/var/log/php5/fpm.log', 'a').close() - self.msg = self.msg + ['/var/log/php5/slow.log', - '/var/log/php5/fpm.log'] + open('/var/log/php/7.2/slow.log', 'a').close() + open('/var/log/php7.2-fpm.log', 'a').close() + self.msg = self.msg + ['/var/log/php/7.2/slow.log', + '/var/log/php7.2-fpm.log'] if self.app.pargs.mysql: # MySQL debug will not work for remote MySQL if WOVar.wo_mysql_host == "localhost":