+
- +
Key Features • - Getting Started • Usage • RoadMap • Changelog • @@ -28,8 +27,10 @@
WordOps site • +Documentation • Community forum • -Documentation +Slack +
--- @@ -41,8 +42,9 @@ - **Up-to-date** : Nginx 1.14.2 with Brotli support, PHP 7.2 & 7.3, MariaDB 10.3 & Redis 5.0 - **Secured** : Hardened WordPress security with strict Nginx location directives - **Powerful** : Optimized Nginx configurations with multiple cache backends support -- **SSL** : Let's Encrypt SSL certificates handled by Acme.sh -- **Modern** : Secured SSL/TLS encryption with strong ciphers_suite and modern TLS protocols +- **SSL** : Let's Encrypt SSL certificates handled by acme.sh +- **Modern** : Secured SSL/TLS encryption with strong ciphers_suite, modern TLS protocols and HSTS support +- **Monitoring** : Live Nginx vhost traffic with ngx_vts_module and server monitoring with Netdata ## Requirements @@ -63,7 +65,7 @@ ## Getting Started ```bash -wget -qO wo wops.cc && sudo bash wo # Install WordOps +curl -sL wops.cc | sudo bash # Install WordOps sudo wo site create example.com --wp # Install required packages & setup WordPress on example.com ``` @@ -75,6 +77,7 @@ WordOps made some fundamental changes: - Support for w3tc is dropped as a security precaution. - PHP 5.6 has been replaced by PHP 7.2 and PHP 7.0 has been replaced by PHP 7.3. - Nginx-ee package has been replaced by Nginx-wo (based on Nginx stable v1.14.2 with Brolti support) +- HHVM stack has been removed - Let's Encrypt stack isn't based on letsencrypt-auto anymore, we use acme.sh to handle SSL certificates If you are going to migrate from EasyEngine v3, here some important informations : @@ -129,15 +132,6 @@ wo site create example.com --wp --letsencrypt # install wordpress & secure site wo site create sub.example.com --wp --letsencrypt=subdomain # install wordpress and secure subdomain with letsencrypt ``` -## Cheatsheet - -| | single site | multisite w/ subdir | multisite w/ subdom | -|--------------------|---------------|-----------------------|--------------------------| -| **NO Cache** | --wp | --wpsubdir | --wpsubdomain | -| **WP Super Cache** | --wpsc | -wpsubdir --wpsc | --wpsubdomain --wpsc | -| **Nginx fastcgi_cache** | --wpfc | --wpsubdir --wpfc | --wpsubdomain --wpfc | -| **Redis cache** | --wpredis | --wpsubdir --wpredis | --wpsubdomain --wpredis | - ## Update WordOps ```bash @@ -146,8 +140,8 @@ wo update ## Support -If you feel there is a bug directly related to WordOps, feel free to open an issue. -For any other questions/suggestions about WordOps or if you need support, please use the [WordOps Community Forum](https://community.wordops.net/). +If you feel there is a bug directly related to WordOps, or if you want to suggest new features for WordOps, feel free to open an issue. +For any other questions about WordOps or if you need support, please use the [Community Forum](https://community.wordops.net/). # Contributing @@ -156,9 +150,18 @@ There is no need to be a developer or a system administrator to contribute to Wo ## Credits -- Main source : [EasyEngine](https://github.com/easyengine/easyengine) +- Source : [EasyEngine](https://github.com/easyengine/easyengine) + +Shipped with WordOps + - Acme client : [Acme.sh](https://github.com/Neilpang/acme.sh) - WordPress deployment : [WP-CLI](https://github.com/wp-cli/wp-cli) +- Monitoring : [Netdata](https://github.com/netdata/netdata) +- [phpMyAdmin](https://www.phpmyadmin.net/) +- [Adminer](https://www.adminer.org/) +- [phpRedisAdmin](https://github.com/erikdubbelboer/phpRedisAdmin) +- [PHPMemcachedAdmin](https://github.com/elijaa/phpmemcachedadmin) +- [opcacheGUI](https://github.com/amnuts/opcache-gui) ## License diff --git a/config/bash_completion.d/wo_auto.rc b/config/bash_completion.d/wo_auto.rc index 8ff11e5..6a6e3a9 100644 --- a/config/bash_completion.d/wo_auto.rc +++ b/config/bash_completion.d/wo_auto.rc @@ -74,7 +74,7 @@ _wo_complete() # HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE "install" | "purge" | "remove" ) COMPREPLY=( $(compgen \ - -W "--web --admin --nginx --php --php73 --mysql --wpcli --phpmyadmin --adminer --utils --all --redis --phpredisadmin" \ + -W "--web --admin --nginx --php --php73 --mysql --wpcli --phpmyadmin --adminer --utils --all --redis --phpredisadmin --composer --netdata --fail2ban" \ -- $cur) ) ;; "upgrade" ) @@ -84,7 +84,7 @@ _wo_complete() ;; "start" | "stop" | "reload" | "restart" | "status") COMPREPLY=( $(compgen \ - -W "--nginx --php --php73 --mysql --memcache --redis" \ + -W "--nginx --php --php73 --mysql --memcache --redis --fail2ban --netdata" \ -- $cur) ) ;; "migrate") @@ -159,7 +159,7 @@ _wo_complete() "create") COMPREPLY=( $(compgen \ - -W "--user --pass --email --html --php --php73 --mysql --wp --wpsubdir --wpsubdomain --wpfc --wpsc --proxy= --wpredis --letsencrypt -le" \ + -W "--user --pass --email --html --php --php73 --mysql --wp --wpsubdir --wpsubdomain --wpfc --wpsc --proxy= --wpredis --letsencrypt --letsencrypt=subdomain -le" \ -- $cur) ) ;; @@ -213,7 +213,7 @@ _wo_complete() if [ ${COMP_WORDS[2]} == "create" ]; then retlist="--wp --wpsc --wpfc --user --email --pass --wpredis --letsencrypt --php73" elif [ ${COMP_WORDS[2]} == "update" ]; then - retlist="--wp --wpfc --wpsc --php73 --php73=off --wpredis --letsencrypt --letsencrypt=subdomain --letsencrypt=off --letsencrypt=renew" + retlist="--wp --wpfc --wpsc --php73 --php73=off --wpredis --letsencrypt --letsencrypt=subdomain --letsencrypt=off --letsencrypt=renew --le --le=subdomain --le=off " else retlist="" fi @@ -230,7 +230,7 @@ _wo_complete() "--wpsubdir" | "--wpsubdomain") if [ ${COMP_WORDS[1]} != "debug" ]; then if [ ${COMP_WORDS[2]} == "create" ]; then - retlist="--wpsc --wpfc --user --email --pass --wpredis --letsencrypt --php73" + retlist="--wpsc --wpfc --user --email --pass --wpredis --letsencrypt --letsencrypt=subdomain --php73" elif [ ${COMP_WORDS[2]} == "update" ]; then retlist="--wpfc --wpsc --php73 --php73=off --wpredis --letsencrypt --letsencrypt=subdomain --letsencrypt=off --letsencrypt=renew" else @@ -248,7 +248,7 @@ _wo_complete() "--wpredis" | "--wpfc" | "--wpsc" | "--wpsubdir" | "--wpsubdomain" | "--user" | "--pass" | "--email" | "--wp") if [ ${COMP_WORDS[2]} == "create" ]; then - retlist="--user --pass --email --wp --wpsubdir --wpsubdomain --wpfc --wpsc --wpredis --php73 --letsencrypt " + retlist="--user --pass --email --wp --wpsubdir --wpsubdomain --wpfc --wpsc --wpredis --php73 --letsencrypt --letsencrypt=subdomain" else retlist="" fi @@ -272,7 +272,7 @@ _wo_complete() -- $cur) ) ;; - "--web" | "--admin" | "--nginx" | "--php" | "--php73" | "--mysql" | "--wpcli" | "--phpmyadmin" | "--adminer" | "--utils" | "--memcache" | "--redis | --phpredisadmin") + "--web" | "--admin" | "--nginx" | "--php" | "--php73" | "--mysql" | "--wpcli" | "--phpmyadmin" | "--adminer" | "--utils" | "--memcached" | "--redis | --phpredisadmin") if [[ ${COMP_WORDS[2]} == "install" || ${COMP_WORDS[2]} == "purge" || ${COMP_WORDS[2]} == "remove" ]]; then retlist="--web --admin --nginx --php --php73 --mysql--wpcli --phpmyadmin --adminer --utils --memcache --redis --phpredisadmin" elif [[ ${COMP_WORDS[2]} == "start" || ${COMP_WORDS[2]} == "reload" || ${COMP_WORDS[2]} == "restart" || ${COMP_WORDS[2]} == "stop" ]]; then @@ -324,8 +324,8 @@ _wo_complete() -- $cur) ) ;; - "--memcache" | "--opcache" | "--fastcgi" | "--all" | "--redis") - retlist="--memcache --opcache --fastcgi --redis --all" + "--memcached" | "--opcache" | "--fastcgi" | "--all" | "--redis") + retlist="--memcached --opcache --fastcgi --redis --all" ret="${retlist[@]/$prev}" COMPREPLY=( $(compgen \ -W "$(echo $ret)" \ @@ -363,7 +363,7 @@ _wo_complete() case "$mprev" in "--user" | "--email" | "--pass") if [ ${COMP_WORDS[2]} == "create" ]; then - retlist="--user --pass --email --html --php --php73 --mysql --wp --wpsubdir --wpsubdomain --wpfc --wpsc --wpredis --letsencrypt" + retlist="--user --pass --email --html --php --php73 --mysql --wp --wpsubdir --wpsubdomain --wpfc --wpsc --wpredis --letsencrypt --letsencrypt=subdomain" fi ret="${retlist[@]/$prev}" COMPREPLY=( $(compgen \ diff --git a/docs/wo.8 b/docs/wo.8 index a6128b8..5c62929 100644 --- a/docs/wo.8 +++ b/docs/wo.8 @@ -3,17 +3,17 @@ .B WordOps (wo) \- Manage Nginx Based Websites. .SH SYNOPSIS -wo [ --version | --help | info | stack | site | debug | update | clean | import_slow_log | log | secure | sync] +wo [ --version | --help | info | stack | site | debug | update | clean | import_slow_log | log | secure | sync | maintenance] .TP -wo stack [ install | remove | purge | migrate | upgrade] [ --web | --all | --nginx | --php | --php73 | --mysql | --admin | --adminer | --redis | --hhvm | --phpmyadmin | --phpredisadmin | --wpcli | --utils ] +wo stack [ install | remove | purge | migrate | upgrade] [ --web | --all | --nginx | --php | --php73 | --mysql | --admin | --adminer | --redis | --phpmyadmin | --phpredisadmin | --wpcli | --utils ] .TP -wo stack [ status | start | stop | reload | restart ] [--all | --nginx | --php | --php73 |--mysql | --web | --memcache | --redis] +wo stack [ status | start | stop | reload | restart ] [--all | --nginx | --php | --php73 |--mysql | --web | --memcached | --redis] .TP wo site [ list | info | show | enable | disable | edit | cd | show ] [ example.com ] .TP -wo site create example.com [ --html | --php | --php73 | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--wpsc | --wpfc | --wpredis | --hhvm | --letsencrypt/-le]] +wo site create example.com [ --html | --php | --php73 | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--wpsc | --wpfc | --wpredis | --letsencrypt/-le/--letsencrypt=subdomain]] .TP -wo site update example.com [ --php | --php73 |--mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--wpsc | --wpfc | --wpredis | --hhvm ] [--password] [--letsencrypt=on/off/renew]] +wo site update example.com [ --php | --php73 |--mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--wpsc | --wpfc | --wpredis ] [--password] [--letsencrypt=on/off/subdomain/renew]] .TP wo site delete example.com [--db | --files | --all | --no-prompt | --force/-f ] .TP @@ -129,13 +129,13 @@ Disable site by Destroying softlink with site file in .br Edit NGINX configuration of site. .TP -.B create [ example.com ] [ --html | --php | --php73 |--mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--wpsc | --wpfc | --wpredis | --hhvm ]] +.B create [ example.com ] [ --html | --php | --php73 |--mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--wpsc | --wpfc | --wpredis ]] .br Create new site according to given options. If no options provided .br create static site with html only. .TP -.B update [ example.com ] [ --html | --php | --php73 |--mysql] [[--wp | --wpsubdir | --wpsubdomain ] [ --wpsc | --wpfc | --wpredis | --hhvm ] [--password]] +.B update [ example.com ] [ --html | --php | --php73 |--mysql] [[--wp | --wpsubdir | --wpsubdomain ] [ --wpsc | --wpfc | --wpredis ] [--password]] .br Update site configuration according to specified options. .TP @@ -163,9 +163,9 @@ if used with --all=off argument. .br Update security settings. .TP -.B clean [ --fastcgi | --opcache | --memcache | --redis | --all ] +.B clean [ --fastcgi | --opcache | --memcached | --redis | --all ] .br -Clean NGINX fastCGI cache, Opcache, Memcache, Redis cache. +Clean NGINX fastCGI cache, Opcache, memcached, Redis cache. .br Clean NGINX fastCGI cache if no option specified. .SH ARGUMENTS @@ -274,17 +274,13 @@ Install and activate Nginx-helper and WP Super Cache plugin. .TP .B --wpfc .br -Install and activate Nginx-helper and W3 Total Cache plugin with +Install and activate Nginx-helper plugin with .br Nginx FastCGI cache. .TP .B --wpredis .br Install, activate, configure Nginx-helper and Redis Object Cache Plugin, Configure NGINX for Redis Page Caching. -.TP -.B --hhvm -.br -Install, activate Nginx-helper and configure NGINX for HHVM. .SH FILES .br /etc/wo/wo.conf diff --git a/install b/install index 213832c..fc47f13 100755 --- a/install +++ b/install @@ -7,10 +7,10 @@ # Copyright (c) 2019 - WordOps # This script is licensed under M.I.T # ------------------------------------------------------------------------- -# Version 3.9.5 - 2019-03-27 +# Version 3.9.5 - 2019-04-14 # ------------------------------------------------------------------------- readonly wo_version_old="2.2.3" -readonly wo_version_new="3.9.4.3" +readonly wo_version_new="3.9.4.5" # CONTENTS # --- # 1. VARIABLES AND DECLARATIONS @@ -56,7 +56,7 @@ wo_lib_error() { ### if [[ $EUID -ne 0 ]]; then wo_lib_echo_fail "Sudo privilege required..." - wo_lib_echo_fail "Use: wget -qO wo wordops.se/tup && sudo bash wo" + wo_lib_echo_fail "Use: curl -sL wops.cc | sudo bash" exit 100 fi @@ -78,10 +78,30 @@ if [ -z "$(command -v lsb_release)" ]; then apt-get -y install lsb-release -qq fi +while [ "$#" -gt 0 ]; do + case "$1" in + -b | --branch) + wo_branch="$2" + shift + ;; + -p | --preserve) + wo_preserve_config="y" + ;; + --force) + wo_force_install="y" + ;; + *) # positional args + ;; + esac + shift +done + ### # 1 - Define variables for later use ### -wo_branch="$1" +if [ -z "$wo_branch" ]; then + wo_branch=master +fi readonly wo_log_dir=/var/log/wo/ readonly wo_backup_dir=/var/lib/wo-backup/ readonly wo_install_log=/var/log/wo/install.log @@ -95,14 +115,15 @@ EE_BACKUP_FILE="/var/lib/wo-backup/ee-backup.$TIME.tar.gz" WO_BACKUP_FILE="/var/lib/wo-backup/wo-backup.$TIME.tar.gz" if [ -x /usr/local/bin/ee ]; then - migration=1 -else - migration=0 + ee_migration=1 +elif [ -x /usr/local/bin/wo ]; then + wo_upgrade=1 fi ### # 1 - Checking linux distro ### +if [ -z "$wo_force_install" ]; then if [ "$wo_linux_distro" != "Ubuntu" ] && [ "$wo_linux_distro" != "Debian" ]; then wo_lib_echo_fail "WordOps (wo) only supports Ubuntu and Debian at the moment." wo_lib_echo_fail "If you are feeling adventurous, you are free to fork WordOps to support" @@ -115,6 +136,7 @@ else exit 100 fi fi +fi ### # 1 - To prevent errors or unexpected behaviour, create the log and ACL it @@ -154,20 +176,20 @@ wo_install_dep() { locale-gen en } >> "$wo_install_log" 2>&1 # Support PFS - if [ -f /etc/nginx/nginx.conf ]; then - # Replace previous ciphers - new_ciphers="EECDH+CHACHA20:EECDH+AESGCM:EECDH+AES" - sed -i "s/ssl_ciphers\ \(\"\|.\|'\)\(.*\)\(\"\|.\|'\);/ssl_ciphers \"$new_ciphers\";/" /etc/nginx/nginx.conf - # Change the TLS protocols - sed -i "s/ssl_protocols\ \(.*\);/ssl_protocols TLSv1.2;/" /etc/nginx/nginx.conf - fi + # if [ -f /etc/nginx/nginx.conf ]; then + # # Replace previous ciphers + # new_ciphers="EECDH+CHACHA20:EECDH+AESGCM:EECDH+AES" + # sed -i "s/ssl_ciphers\ \(\"\|.\|'\)\(.*\)\(\"\|.\|'\);/ssl_ciphers \"$new_ciphers\";/" /etc/nginx/nginx.conf + # # Change the TLS protocols + # sed -i "s/ssl_protocols\ \(.*\);/ssl_protocols TLSv1.2;/" /etc/nginx/nginx.conf + # fi - # Let's Encrypt .well-known folder setup - if [ ! -d /var/www/html/.well-known/acme-challenge ]; then - mkdir -p /var/www/html/.well-known/acme-challenge - chown -R www-data:www-data /var/www/html /var/www/html/.well-known - chmod 750 /var/www/html /var/www/html/.well-known - fi + # # Let's Encrypt .well-known folder setup + # if [ ! -d /var/www/html/.well-known/acme-challenge ]; then + # mkdir -p /var/www/html/.well-known/acme-challenge + # chown -R www-data:www-data /var/www/html /var/www/html/.well-known + # chmod 750 /var/www/html /var/www/html/.well-known + # fi } ### @@ -228,8 +250,8 @@ wo_sync_db() { wo_site_current_type=$(grep "common/" /etc/nginx/sites-available/$site | awk -F "/" '{print $2}') - if [ "$(echo "$wo_site_current_type" | grep php)" ]; then - if [ "$(echo "$wo_site_current_type" | grep php7)" ]; then + if [ "$(echo $wo_site_current_type | grep php)" ]; then + if [ "$(echo $wo_site_current_type | grep php7)" ]; then wo_php_version="7.0" else wo_php_version="5.6" @@ -238,28 +260,28 @@ wo_sync_db() { wo_php_version="" fi - if [ "$(echo "$wo_site_current_type" | grep redis)" ]; then + if [ "$(echo $wo_site_current_type | grep redis)" ]; then wo_site_current_cache="wpredis" - elif [ -z "$(echo "$wo_site_current_type" | grep wpsc)" ]; then + elif [ -z "$(echo $wo_site_current_type | grep wpsc)" ]; then wo_site_current_cache="wpsc" - elif [ -z "$(echo "$wo_site_current_type" | grep wpfc)" ]; then + elif [ -z "$(echo $wo_site_current_type | grep wpfc)" ]; then wo_site_current_cache="wpfc" else wo_site_current_cache="basic" fi - if [ "$(echo "$wo_site_current_type" | grep wp)" ]; then - if [ -z "$(echo "$wo_site_current_type" | grep wpsubdir)" ]; then + if [ "$(echo $wo_site_current_type | grep wp)" ]; then + if [ -z "$(echo $wo_site_current_type | grep wpsubdir)" ]; then wo_site_current="wpsubdir" - elif [ -z "$(echo "$wo_site_current_type" | grep wpsudomain)" ]; then + elif [ -z "$(echo $wo_site_current_type | grep wpsudomain)" ]; then wo_site_current="wpsubdomain" else wo_site_current="wp" fi else - if [ -z "$(echo "$wo_site_current_type" | grep location)" ]; then + if [ -z "$(echo $wo_site_current_type | grep location)" ]; then wo_site_current="proxy" - elif [ -z "$(echo "$wo_site_current_type" | grep php)" ]; then + elif [ -z "$(echo $wo_site_current_type | grep php)" ]; then wo_site_current="html" else if [ -f /var/www/${site}/ee-config.php ] || [ -f /var/www/${site}/wo-config.php ]; then @@ -360,37 +382,35 @@ wo_install_acme_sh() { } >> "$wo_install_log" 2>&1 fi - if [ -d "$HOME/.acme/.sh" ]; then + if [ -d "$HOME/.acme.sh" ]; then { - rsync -az --exclude="account.conf" \ + /usr/bin/rsync -rltgoDpz --exclude="account.conf" \ --exclude="acme.sh" \ --exclude="acme.sh.env" \ --exclude="deploy" \ --exclude="dnsapi" \ --exclude="http.header" \ --exclude="ca" \ + --del \ "$HOME/.acme.sh/" \ /etc/letsencrypt/renewal/ + } >> "$wo_install_log" 2>&1 fi } -# Now, finally, let's install WordOps +# Clone Github repository if it doesn't exist wo_install() { { - rm -rf /tmp/easyengine - rm -rf /tmp/wordops - - [ -z "$wo_branch" ] && { - wo_branch=master - } - - git clone -b "$wo_branch" https://github.com/WordOps/WordOps.git /tmp/wordops --quiet - - cd /tmp/wordops || exit 1 + if [ ! -d /tmp/WordOps/.git ]; then + rm -rf /tmp/WordOps + git clone https://github.com/WordOps/WordOps.git /tmp/WordOps -b "$wo_branch" + else + git -C /tmp/WordOps pull origin "$wo_branch" + fi + cd /tmp/WordOps || exit 1 } >> "$wo_install_log" 2>&1 python3 setup.py install - } wo_upgrade_nginx() { @@ -402,13 +422,17 @@ wo_upgrade_nginx() { rm -rf /var/lib/wo-backup/nginx fi # backup nginx conf - /usr/bin/rsync -az /etc/nginx/ /var/lib/wo-backup/nginx/ - + if [ -d /etc/nginx ]; then + /usr/bin/rsync -az /etc/nginx/ /var/lib/wo-backup/nginx/ + fi + if [ -d /etc/php ]; then + /usr/bin/rsync -az /etc/php/ /var/lib/wo-backup/php/ + fi # chec if the package nginx-ee is installed CHECK_NGINX_EE=$(dpkg --list | grep nginx-ee) CHECK_NGINX_WO=$(dpkg --list | grep nginx-wo) - CHECK_PHP72=$(dpkg --list | grep php7.2-fpm) - CHECK_PHP73=$(dpkg --list | grep php7.3-fpm) + CHECK_PHP72=$(command -v php-fpm7.2) + CHECK_PHP73=$(command -v php-fpm7.3) # add new Nginx repository if [ "$wo_linux_distro" = "Ubuntu" ]; then @@ -447,25 +471,28 @@ wo_upgrade_nginx() { # remove previous package apt-mark unhold nginx-ee nginx-common nginx-custom apt-get -y -qq autoremove nginx-ee nginx-common nginx-custom --purge - rm -rf /etc/nginx elif [ -n "$CHECK_NGINX_WO" ]; then apt-mark unhold nginx-wo nginx-common nginx-custom apt-get -y -qq autoremove nginx-wo nginx-common nginx-custom --purge + + fi + if [ -d /etc/nginx ]; then rm -rf /etc/nginx fi - # remove previous php-fpm pool configuration if [ -n "$CHECK_PHP72" ]; then apt-get remove php7.2-fpm -y -qq --purge rm -f /etc/php/7.2/fpm/pool.d/{www.conf,www-two.conf,debug.conf} fi - /usr/local/bin/wo stack install --nginx --php - echo "$wo_version_new" > /etc/nginx/common/release if [ -n "$CHECK_PHP73" ]; then + WO_STACK_INSTALL_ARGS="--php73" apt-get remove php7.3-fpm -y -qq --purge rm -f /etc/php/7.3/fpm/pool.d/{www.conf,www-two.conf,debug.conf} - /usr/local/bin/wo stack install --php73 + else + WO WO_STACK_INSTALL_ARGS="" fi + /usr/local/bin/wo stack install --nginx --php $WO_STACK_INSTALL_ARGS + echo "$wo_version_new" > /etc/nginx/common/release rm -f /etc/nginx/common/acl.conf /etc/nginx/conf.d/{map-wp-cache.conf,map-wp.conf} fi @@ -593,7 +620,7 @@ wo_backup_ee() { } wo_backup_wo() { - tar -I pigz -cf "$WO_BACKUP_FILE" /etc/nginx/ /usr/local/lib/python3.6/dist-packages/wo-*.egg /etc/wo >> /var/log/wo/install.log 2>&1 + tar -I pigz -cf "$WO_BACKUP_FILE" /etc/nginx/ /usr/local/lib/python3.6/dist-packages/wo-*.egg /etc/wo /var/lib/wo >> /var/log/wo/install.log 2>&1 } wo_clean_ee() { @@ -623,10 +650,8 @@ if [ -x /usr/local/bin/wo ]; then wo_upgrade_nginx | tee -ai $wo_install_log fi wo_update_latest | tee -ai $wo_install_log - if [ ! -d /opt/acme.sh ]; then - wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log - wo_install_acme_sh | tee -ai $wo_install_log - fi + wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log + wo_install_acme_sh | tee -ai $wo_install_log wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log wo_git_init | tee -ai $wo_install_log wo_update_wp_cli | tee -ai $wo_install_log @@ -655,10 +680,8 @@ else wo_upgrade_nginx | tee -ai $wo_install_log fi wo_update_latest | tee -ai $wo_install_log - if [ ! -d /opt/acme.sh ]; then - wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log - wo_install_acme_sh | tee -ai $wo_install_log - fi + wo_lib_echo "Installing acme.sh" | tee -ai $wo_install_log + wo_install_acme_sh | tee -ai $wo_install_log wo_lib_echo "Running post-install steps " | tee -ai $wo_install_log wo_git_init | tee -ai $wo_install_log wo_update_wp_cli | tee -ai $wo_install_log @@ -684,21 +707,19 @@ fi wo sync | tee -ai $wo_install_log -if [ "$migration" -eq "1" ]; then +if [ "$ee_migration" = "1" ]; then echo wo_lib_echo "The migration from EasyEngine to WordOps was succesfull!" wo_lib_echo "The EasyEngine backup files can be found in /var/lib/wo-backup/ee-backup.tgz" echo - wo_lib_echo_info "For autocompletion, run the following command:" - wo_lib_echo_info "source /etc/bash_completion.d/wo_auto.rc" - echo - wo_lib_echo "WordOps (wo) help: https://docs.wordops.net" +elif [ "$wo_upgrade" = "1" ]; then + wo_lib_echo "WordOps (wo) upgrade to $wo_version_new was succesfull!" else - echo - wo_lib_echo "For WordOps (wo) auto completion, run the following command" - echo - wo_lib_echo_info "source /etc/bash_completion.d/wo_auto.rc" - echo - wo_lib_echo "Yay! WordOps (wo) installed/updated successfully" - wo_lib_echo "WordOps (wo) help: https://docs.wordops.net" + wo_lib_echo "WordOps (wo) installed successfully" fi +wo_lib_echo_info "For autocompletion, run the following command:" +wo_lib_echo_info "source /etc/bash_completion.d/wo_auto.rc" +echo +wo_lib_echo "WordOps Documentation : https://docs.wordops.net" +wo_lib_echo "WordOps Community Forum : https://community.wordops.net" +echo diff --git a/logo.png b/logo.png new file mode 100644 index 0000000..2fe842e Binary files /dev/null and b/logo.png differ diff --git a/setup.py b/setup.py index df2f56d..177f910 100644 --- a/setup.py +++ b/setup.py @@ -33,11 +33,9 @@ try: wo_user = config['user']['name'] wo_email = config['user']['email'] except Exception as e: - print("WordOps (wo) required your name & email address to track" - " changes you made under the Git version control") - print("WordOps (wo) will be able to send you daily reports & alerts in " - "upcoming version") - print("WordOps (wo) will NEVER share your information with other parties") + print("WordOps (wo) require an username & and an email " + "address to configure Git (used to save server configurations)") + print("Your informations will ONLY be stored locally") wo_user = input("Enter your name: ") while wo_user is "": @@ -55,7 +53,7 @@ except Exception as e: os.system("git config --global user.email {0}".format(wo_email)) if not os.path.isfile('/root/.gitconfig'): - shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig') + shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig') setup(name='wo', version='3.9.4', @@ -87,7 +85,7 @@ setup(name='wo', 'psutil == 3.1.1', 'sh', 'SQLAlchemy', - ], + ], data_files=[('/etc/wo', ['config/wo.conf']), ('/etc/wo/plugins.d', conf), ('/usr/lib/wo/templates', templates), diff --git a/wo/cli/controllers/base.py b/wo/cli/controllers/base.py index 9a2dbc0..ac0e34f 100644 --- a/wo/cli/controllers/base.py +++ b/wo/cli/controllers/base.py @@ -13,12 +13,11 @@ Copyright (c) 2019 WordOps. class WOBaseController(CementBaseController): class Meta: label = 'base' - description = ("WordOps is the commandline tool to manage your" - " websites based on WordPress and Nginx with easy to" - " use commands") + description = ("An essential toolset that eases WordPress " + "site and server administration with Nginx") arguments = [ (['-v', '--version'], dict(action='version', version=BANNER)), - ] + ] @expose(hide=True) def default(self): diff --git a/wo/cli/plugins/clean.py b/wo/cli/plugins/clean.py index 58b1246..b434815 100644 --- a/wo/cli/plugins/clean.py +++ b/wo/cli/plugins/clean.py @@ -89,11 +89,12 @@ class WOCleanController(CementBaseController): try: Log.info(self, "Cleaning opcache") wp = urllib.request.urlopen(" https://127.0.0.1:22222/cache" - "/opcache/opgui.php?page=reset").read() + "/opcache/opgui.php?reset=1").read() except Exception as e: Log.debug(self, "{0}".format(e)) Log.debug(self, "Unable hit url, " - " https://127.0.0.1:22222/cache/opcache/opgui.php?page=reset," + " https://127.0.0.1:22222/cache/opcache/" + "opgui.php?reset=1," " please check you have admin tools installed") Log.debug(self, "please check you have admin tools installed," " or install them with `wo stack install --admin`") diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index 439bd1a..f96642f 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -163,7 +163,8 @@ class WOSiteController(CementBaseController): sslexpiry = '' data = dict(domain=wo_domain, webroot=wo_site_webroot, accesslog=access_log, errorlog=error_log, - dbname=wo_db_name, dbuser=wo_db_user, php_version=php_version, + dbname=wo_db_name, dbuser=wo_db_user, + php_version=php_version, dbpass=wo_db_pass, ssl=ssl, sslprovider=sslprovider, sslexpiry=sslexpiry, type=sitetype + " " + cachetype + " ({0})" @@ -279,7 +280,8 @@ class WOSiteEditController(CementBaseController): except CommandExecutionError as e: Log.error(self, "Failed invoke editor") if (WOGit.checkfilestatus(self, "/etc/nginx", - '/etc/nginx/sites-available/{0}'.format(wo_domain))): + '/etc/nginx/sites-available/{0}' + .format(wo_domain))): WOGit.add(self, ["/etc/nginx"], msg="Edit website: {0}" .format(wo_domain)) # Reload NGINX @@ -334,6 +336,9 @@ class WOSiteCreateController(CementBaseController): action='store' or 'store_const', choices=('on', 'subdomain', 'wildcard'), const='on', nargs='?')), + (['--hsts'], + dict(help="enable HSTS for site secured with letsencrypt", + action='store_true')), (['--user'], dict(help="provide user for WordPress site")), (['--email'], @@ -493,7 +498,8 @@ class WOSiteCreateController(CementBaseController): webroot=data['webroot']) Log.debug(self, str(e)) Log.error(self, "Check the log for details: " - "`tail /var/log/wo/wordops.log` and please try again") + "`tail /var/log/wo/wordops.log` " + "and please try again") if 'proxy' in data.keys() and data['proxy']: addNewSite(self, wo_domain, stype, cache, wo_site_webroot) @@ -507,7 +513,8 @@ class WOSiteCreateController(CementBaseController): Log.error(self, "service nginx reload failed. " "check issues with `nginx -t` command") Log.error(self, "Check the log for details: " - "`tail /var/log/wo/wordops.log` and please try again") + "`tail /var/log/wo/wordops.log` " + "and please try again") if wo_auth and len(wo_auth): for msg in wo_auth: Log.info(self, Log.ENDC + msg, log=False) @@ -545,7 +552,8 @@ class WOSiteCreateController(CementBaseController): dbhost=data['wo_db_host']) deleteSiteInfo(self, wo_domain) Log.error(self, "Check the log for details: " - "`tail /var/log/wo/wordops.log` and please try again") + "`tail /var/log/wo/wordops.log` " + "and please try again") try: wodbconfig = open("{0}/wo-config.php" @@ -575,7 +583,8 @@ class WOSiteCreateController(CementBaseController): dbhost=data['wo_db_host']) deleteSiteInfo(self, wo_domain) Log.error(self, "Check the log for details: " - "`tail /var/log/wo/wordops.log` and please try again") + "`tail /var/log/wo/wordops.log` " + "and please try again") # Setup WordPress if Wordpress site if data['wp']: @@ -599,7 +608,8 @@ class WOSiteCreateController(CementBaseController): dbhost=data['wo_mysql_grant_host']) deleteSiteInfo(self, wo_domain) Log.error(self, "Check the log for details: " - "`tail /var/log/wo/wordops.log` and please try again") + "`tail /var/log/wo/wordops.log` " + "and please try again") # Service Nginx Reload call cleanup if failed to reload nginx if not WOService.reload_service(self, 'nginx'): @@ -617,7 +627,8 @@ class WOSiteCreateController(CementBaseController): Log.info(self, Log.FAIL + "service nginx reload failed." " check issues with `nginx -t` command.") Log.error(self, "Check the log for details: " - "`tail /var/log/wo/wordops.log` and please try again") + "`tail /var/log/wo/wordops.log` " + "and please try again") WOGit.add(self, ["/etc/nginx"], msg="{0} created with {1} {2}" @@ -640,7 +651,8 @@ class WOSiteCreateController(CementBaseController): dbhost=data['wo_mysql_grant_host']) deleteSiteInfo(self, wo_domain) Log.error(self, "Check the log for details: " - "`tail /var/log/wo/wordops.log` and please try again") + "`tail /var/log/wo/wordops.log` and " + "please try again") if wo_auth and len(wo_auth): for msg in wo_auth: @@ -661,18 +673,30 @@ class WOSiteCreateController(CementBaseController): "`tail /var/log/wo/wordops.log` and please try again") if self.app.pargs.letsencrypt == "on": - data['letsencrypt'] = True - letsencrypt = True + if self.app.pargs.hsts: + data['letsencrypt'] = True + letsencrypt = True + data['hsts'] = True + hsts = True + else: + data['letsencrypt'] = True + letsencrypt = True + data['hsts'] = False + hsts = False if data['letsencrypt'] is True: setupLetsEncrypt(self, wo_domain) httpsRedirect(self, wo_domain) + if data['hsts'] is True: + setupHsts(self, wo_domain) + if not WOService.reload_service(self, 'nginx'): Log.error(self, "service nginx reload failed. " "check issues with `nginx -t` command") - Log.info(self, "Congratulations! Successfully Configured SSl for Site " + Log.info(self, "Congratulations! Successfully Configured " + "SSl for Site " " https://{0}".format(wo_domain)) # Add nginx conf folder into GIT @@ -689,15 +713,23 @@ class WOSiteCreateController(CementBaseController): data['letsencrypt'] = True letsencrypt = True + if self.app.pargs.hsts == 'on': + data['hsts'] = True + hsts = True + if data['letsencrypt'] is True: setupLetsEncryptSubdomain(self, wo_domain) httpsRedirect(self, wo_domain) + if data['hsts'] is True: + setupHsts(self, wo_domain) + if not WOService.reload_service(self, 'nginx'): Log.error(self, "service nginx reload failed. " "check issues with `nginx -t` command") - Log.info(self, "Congratulations! Successfully Configured SSl for Site " + Log.info(self, "Congratulations! Successfully Configured " + "SSl for Site " " https://{0}".format(wo_domain)) # Add nginx conf folder into GIT @@ -753,6 +785,11 @@ class WOSiteUpdateController(CementBaseController): action='store' or 'store_const', choices=('on', 'off', 'renew', 'subdomain', 'wildcard'), const='on', nargs='?')), + (['--hsts'], + dict(help="configure hsts for the site", + action='store' or 'store_const', + choices=('on', 'off'), + const='on', nargs='?')), (['--proxy'], dict(help="update to proxy site", nargs='+')), (['--experimental'], @@ -776,7 +813,7 @@ class WOSiteUpdateController(CementBaseController): if not (pargs.php or pargs.php73 or pargs.mysql or pargs.wp or pargs.wpsubdir or pargs.wpsubdomain or pargs.wpfc or pargs.wpsc or - pargs.wpredis or pargs.letsencrypt): + pargs.wpredis or pargs.letsencrypt or pargs.hsts): Log.error(self, "Please provide options to update sites.") if pargs.all: @@ -853,7 +890,8 @@ class WOSiteUpdateController(CementBaseController): if (pargs.password and not (pargs.html or pargs.php or pargs.php73 or pargs.mysql or pargs.wp or pargs.wpfc or pargs.wpsc or - pargs.wpsubdir or pargs.wpsubdomain)): + pargs.wpsubdir or pargs.wpsubdomain or + pargs.hsts)): try: updatewpuserpassword(self, wo_domain, wo_site_webroot) except SiteError as e: @@ -1009,7 +1047,8 @@ class WOSiteUpdateController(CementBaseController): " https://{0}".format(wo_domain)) if (SSL.getExpirationDays(self, wo_domain) > 0): Log.info(self, "Your cert will expire within " + - str(SSL.getExpirationDays(self, wo_domain)) + " days.") + str(SSL.getExpirationDays(self, wo_domain)) + + " days.") Log.info(self, "Expiration date: " + str(SSL.getExpirationDate(self, wo_domain))) @@ -1040,12 +1079,14 @@ class WOSiteUpdateController(CementBaseController): if (SSL.getExpirationDays(self, wo_domain) > 0): Log.info(self, "Your cert will expire within " + - str(SSL.getExpirationDays(self, wo_domain)) + " days.") + str(SSL.getExpirationDays(self, wo_domain)) + + " days.") Log.info(self, "Expiration date: \n\n" + str(SSL.getExpirationDate(self, wo_domain))) return 0 # else: - # Log.warn(self, "Your cert already EXPIRED ! .PLEASE renew soon . ") + # Log.warn(self, "Your cert already EXPIRED ! + # .PLEASE renew soon . ") else: Log.info( self, "SSL not configured for " @@ -1115,6 +1156,14 @@ class WOSiteUpdateController(CementBaseController): cache == oldcachetype): return 1 + if pargs.hsts: + if pargs.hsts == "on": + data['hsts'] = True + hsts = True + elif pargs.hsts == "off": + data['hsts'] = False + hsts = False + if not data: Log.error(self, "Cannot update {0}, Invalid Options" .format(wo_domain)) @@ -1125,7 +1174,7 @@ class WOSiteUpdateController(CementBaseController): data['wo_db_pass'] = check_site.db_password data['wo_db_host'] = check_site.db_host - if not pargs.letsencrypt: + if not (pargs.letsencrypt or pargs.hsts): try: pre_run_checks(self) except SiteError as e: @@ -1175,15 +1224,18 @@ class WOSiteUpdateController(CementBaseController): Log.error(self, "service nginx reload failed. " "check issues with `nginx -t` command") - Log.info(self, "Congratulations! Successfully Configured SSl for Site " + Log.info(self, "Congratulations! Successfully " + "Configured SSl for Site " " https://{0}".format(wo_domain)) if (SSL.getExpirationDays(self, wo_domain) > 0): Log.info(self, "Your cert will expire within " + - str(SSL.getExpirationDays(self, wo_domain)) + " days.") + str(SSL.getExpirationDays(self, wo_domain)) + + " days.") else: Log.warn( - self, "Your cert already EXPIRED ! .PLEASE renew soon . ") + self, "Your cert already EXPIRED ! " + ".PLEASE renew soon . ") elif data['letsencrypt'] is False: if os.path.isfile("{0}/conf/nginx/ssl.conf" @@ -1194,6 +1246,12 @@ class WOSiteUpdateController(CementBaseController): '{0}/conf/nginx/ssl.conf.disabled' .format(wo_site_webroot)) httpsRedirect(self, wo_domain, False) + if os.path.isfile("{0}/conf/nginx/hsts.conf" + .format(wo_site_webroot)): + WOFileUtils.mvfile(self, "{0}/conf/nginx/hsts.conf" + .format(wo_site_webroot), + '{0}/conf/nginx/hsts.conf.disabled' + .format(wo_site_webroot)) if not WOService.reload_service(self, 'nginx'): Log.error(self, "service nginx reload failed. " "check issues with `nginx -t` command") @@ -1228,7 +1286,8 @@ class WOSiteUpdateController(CementBaseController): if (SSL.getExpirationDays(self, wo_domain) > 0): Log.info(self, "Your cert will expire within " + - str(SSL.getExpirationDays(self, wo_domain)) + " days.") + str(SSL.getExpirationDays(self, wo_domain)) + + " days.") else: Log.warn( self, "Your cert already EXPIRED !" @@ -1243,6 +1302,14 @@ class WOSiteUpdateController(CementBaseController): '{0}/conf/nginx/ssl.conf.disabled' .format(wo_site_webroot)) httpsRedirect(self, wo_domain, False) + if os.path.isfile(("{0}/conf/nginx/hsts.conf") + .format(wo_site_webroot)): + WOFileUtils.mvfile(self, "{0}/conf/nginx/" + "hsts.conf" + .format(wo_site_webroot), + '{0}/conf/nginx/hsts.conf.disabled' + .format(wo_site_webroot)) + if not WOService.reload_service(self, 'nginx'): Log.error(self, "service nginx reload failed. " "check issues with `nginx -t` command") @@ -1261,6 +1328,39 @@ class WOSiteUpdateController(CementBaseController): updateSiteInfo(self, wo_domain, ssl=letsencrypt) return 0 + if pargs.hsts: + if data['hsts'] is True: + if os.path.isfile(("{0}/conf/nginx/ssl.conf") + .format(wo_site_webroot)): + if not os.path.isfile("{0}/conf/nginx/hsts.conf" + .format(wo_site_webroot)): + setupHsts(self, wo_domain) + else: + Log.error(self, "HSTS is already configured for given " + "site") + if not WOService.reload_service(self, 'nginx'): + Log.error(self, "service nginx reload failed. " + "check issues with `nginx -t` command") + else: + Log.error(self, "HTTPS is not configured for given " + "site") + return 0 + + elif data['hsts'] is False: + if os.path.isfile(("{0}/conf/nginx/hsts.conf") + .format(wo_site_webroot)): + WOFileUtils.mvfile(self, "{0}/conf/nginx/hsts.conf" + .format(wo_site_webroot), + '{0}/conf/nginx/hsts.conf.disabled' + .format(wo_site_webroot)) + if not WOService.reload_service(self, 'nginx'): + Log.error(self, "service nginx reload failed. " + "check issues with `nginx -t` command") + else: + Log.error(self, "HSTS is not configured for given " + "site") + return 0 + if stype == oldsitetype and cache == oldcachetype: # Service Nginx Reload @@ -1269,7 +1369,8 @@ class WOSiteUpdateController(CementBaseController): "check issues with `nginx -t` command") updateSiteInfo(self, wo_domain, stype=stype, cache=cache, - ssl=True if check_site.is_ssl else False, php_version=check_php_version) + ssl=True if check_site.is_ssl else False, + php_version=check_php_version) Log.info(self, "Successfully updated site" " http://{0}".format(wo_domain)) @@ -1327,44 +1428,98 @@ class WOSiteUpdateController(CementBaseController): Log.debug(self, str(e)) Log.info(self, Log.FAIL + "Update site failed. " "Check the log for details:" - " `tail /var/log/wo/wordops.log` and please try again") + " `tail /var/log/wo/wordops.log` " + "and please try again") return 1 if ((oldcachetype in ['wpsc', 'basic', 'wpredis'] and - (data['wpfc'])) or (oldsitetype == 'wp' and data['multisite'] and data['wpfc'])): + (data['wpfc'])) or (oldsitetype == 'wp' and + data['multisite'] and data['wpfc'])): try: - plugin_data = '{"log_level":"INFO","log_filesize":5,"enable_purge":1,"enable_map":0,"enable_log":0,"enable_stamp":0,"purge_homepage_on_new":1,"purge_homepage_on_edit":1,"purge_homepage_on_del":1,"purge_archive_on_new":1,"purge_archive_on_edit":0,"purge_archive_on_del":0,"purge_archive_on_new_comment":0,"purge_archive_on_deleted_comment":0,"purge_page_on_mod":1,"purge_page_on_new_comment":1,"purge_page_on_deleted_comment":1,"cache_method":"enable_fastcgi","purge_method":"get_request","redis_hostname":"127.0.0.1","redis_port":"6379","redis_prefix":"nginx-cache:"}' + plugin_data = '{"log_level":"INFO","log_filesize":5,' + '"enable_purge":1,"enable_map":0,"enable_log":0,' + '"enable_stamp":0,"purge_homepage_on_new":1,' + '"purge_homepage_on_edit":1,"purge_homepage_on_del":1,' + '"purge_archive_on_new":1,"purge_archive_on_edit":0,' + '"purge_archive_on_del":0,' + '"purge_archive_on_new_comment":0,' + '"purge_archive_on_deleted_comment":0,' + '"purge_page_on_mod":1,' + '"purge_page_on_new_comment":1,' + '"purge_page_on_deleted_comment":1,' + '"cache_method":"enable_fastcgi",' + '"purge_method":"get_request",' + '"redis_hostname":"127.0.0.1","redis_port":"6379",' + '"redis_prefix":"nginx-cache:"}' setupwp_plugin( - self, 'nginx-helper', 'rt_wp_nginx_helper_options', plugin_data, data) + self, 'nginx-helper', + 'rt_wp_nginx_helper_options', plugin_data, data) except SiteError as e: Log.debug(self, str(e)) - Log.info(self, Log.FAIL + "Update nginx-helper settings failed. " + Log.info(self, Log.FAIL + "Update nginx-helper " + "settings failed. " "Check the log for details:" - " `tail /var/log/wo/wordops.log` and please try again") + " `tail /var/log/wo/wordops.log` " + "and please try again") return 1 elif ((oldcachetype in ['wpsc', 'basic', 'wpfc'] and - (data['wpredis'])) or (oldsitetype == 'wp' and data['multisite'] and data['wpredis'])): + (data['wpredis'])) or (oldsitetype == 'wp' and + data['multisite'] and + data['wpredis'])): try: - plugin_data = '{"log_level":"INFO","log_filesize":5,"enable_purge":1,"enable_map":0,"enable_log":0,"enable_stamp":0,"purge_homepage_on_new":1,"purge_homepage_on_edit":1,"purge_homepage_on_del":1,"purge_archive_on_new":1,"purge_archive_on_edit":0,"purge_archive_on_del":0,"purge_archive_on_new_comment":0,"purge_archive_on_deleted_comment":0,"purge_page_on_mod":1,"purge_page_on_new_comment":1,"purge_page_on_deleted_comment":1,"cache_method":"enable_redis","purge_method":"get_request","redis_hostname":"127.0.0.1","redis_port":"6379","redis_prefix":"nginx-cache:"}' + plugin_data = '{"log_level":"INFO","log_filesize":5,' + '"enable_purge":1,"enable_map":0,"enable_log":0,' + '"enable_stamp":0,"purge_homepage_on_new":1,' + '"purge_homepage_on_edit":1,"purge_homepage_on_del":1,' + '"purge_archive_on_new":1,"purge_archive_on_edit":0,' + '"purge_archive_on_del":0,' + '"purge_archive_on_new_comment":0,' + '"purge_archive_on_deleted_comment":0,' + '"purge_page_on_mod":1,' + '"purge_page_on_new_comment":1,' + '"purge_page_on_deleted_comment":1,' + '"cache_method":"enable_redis",' + '"purge_method":"get_request",' + '"redis_hostname":"127.0.0.1","redis_port":"6379",' + '"redis_prefix":"nginx-cache:"}' setupwp_plugin( - self, 'nginx-helper', 'rt_wp_nginx_helper_options', plugin_data, data) + self, 'nginx-helper', + 'rt_wp_nginx_helper_options', plugin_data, data) except SiteError as e: Log.debug(self, str(e)) - Log.info(self, Log.FAIL + "Update nginx-helper settings failed. " + Log.info(self, Log.FAIL + "Update nginx-helper " + "settings failed. " "Check the log for details:" - " `tail /var/log/wo/wordops.log` and please try again") + " `tail /var/log/wo/wordops.log` " + "and please try again") return 1 else: try: - plugin_data = '{"log_level":"INFO","log_filesize":5,"enable_purge":0,"enable_map":0,"enable_log":0,"enable_stamp":0,"purge_homepage_on_new":1,"purge_homepage_on_edit":1,"purge_homepage_on_del":1,"purge_archive_on_new":1,"purge_archive_on_edit":0,"purge_archive_on_del":0,"purge_archive_on_new_comment":0,"purge_archive_on_deleted_comment":0,"purge_page_on_mod":1,"purge_page_on_new_comment":1,"purge_page_on_deleted_comment":1,"cache_method":"enable_redis","purge_method":"get_request","redis_hostname":"127.0.0.1","redis_port":"6379","redis_prefix":"nginx-cache:"}' + plugin_data = '{"log_level":"INFO","log_filesize":5,' + '"enable_purge":0,"enable_map":0,"enable_log":0,' + '"enable_stamp":0,"purge_homepage_on_new":1,' + '"purge_homepage_on_edit":1,"purge_homepage_on_del":1,' + '"purge_archive_on_new":1,"purge_archive_on_edit":0,' + '"purge_archive_on_del":0,' + '"purge_archive_on_new_comment":0,' + '"purge_archive_on_deleted_comment":0,' + '"purge_page_on_mod":1,"purge_page_on_new_comment":1,' + '"purge_page_on_deleted_comment":1,' + '"cache_method":"enable_redis",' + '"purge_method":"get_request",' + '"redis_hostname":"127.0.0.1",' + '"redis_port":"6379","redis_prefix":"nginx-cache:"}' setupwp_plugin( - self, 'nginx-helper', 'rt_wp_nginx_helper_options', plugin_data, data) + self, 'nginx-helper', + 'rt_wp_nginx_helper_options', plugin_data, data) except SiteError as e: Log.debug(self, str(e)) - Log.info(self, Log.FAIL + "Update nginx-helper settings failed. " + Log.info(self, Log.FAIL + "Update nginx-helper " + "settings failed. " "Check the log for details:" - " `tail /var/log/wo/wordops.log` and please try again") + " `tail /var/log/wo/wordops.log` " + "and please try again") return 1 if oldcachetype == 'wpsc' and not data['wpsc']: @@ -1374,7 +1529,8 @@ class WOSiteUpdateController(CementBaseController): Log.debug(self, str(e)) Log.info(self, Log.FAIL + "Update site failed." "Check the log for details:" - " `tail /var/log/wo/wordops.log` and please try again") + " `tail /var/log/wo/wordops.log` " + "and please try again") return 1 if oldcachetype == 'wpredis' and not data['wpredis']: @@ -1384,7 +1540,8 @@ class WOSiteUpdateController(CementBaseController): Log.debug(self, str(e)) Log.info(self, Log.FAIL + "Update site failed." "Check the log for details:" - " `tail /var/log/wo/wordops.log` and please try again") + " `tail /var/log/wo/wordops.log` " + "and please try again") return 1 if oldcachetype != 'wpsc' and data['wpsc']: @@ -1401,10 +1558,12 @@ class WOSiteUpdateController(CementBaseController): try: if installwp_plugin(self, 'redis-cache', data): # search for wp-config.php - if WOFileUtils.isexist(self, "{0}/wp-config.php".format(wo_site_webroot)): + if WOFileUtils.isexist(self, "{0}/wp-config.php" + .format(wo_site_webroot)): config_path = '{0}/wp-config.php'.format( wo_site_webroot) - elif WOFileUtils.isexist(self, "{0}/htdocs/wp-config.php".format(wo_site_webroot)): + elif WOFileUtils.isexist(self, "{0}/htdocs/wp-config.php" + .format(wo_site_webroot)): config_path = '{0}/htdocs/wp-config.php'.format( wo_site_webroot) else: @@ -1415,22 +1574,24 @@ class WOSiteUpdateController(CementBaseController): self, "wp-config.php could not be located !!") raise SiteError - if WOShellExec.cmd_exec(self, "grep -q \"WP_CACHE_KEY_SALT\" {0}" + if WOShellExec.cmd_exec(self, "grep -q " + "\"WP_CACHE_KEY_SALT\" {0}" .format(config_path)): pass else: try: wpconfig = open("{0}".format(config_path), encoding='utf-8', mode='a') - wpconfig.write("\n\ndefine( \'WP_CACHE_KEY_SALT\', \'{0}:\' );" - .format(wo_domain)) + wpconfig.write("\n\ndefine( \'WP_CACHE_KEY_SALT\'," + " \'{0}:\' );".format(wo_domain)) wpconfig.close() except IOError as e: Log.debug(self, str(e)) Log.debug(self, "Updating wp-config.php failed.") Log.warn(self, "Updating wp-config.php failed. " - "Could not append:" - "\ndefine( \'WP_CACHE_KEY_SALT\', \'{0}:\' );".format(wo_domain) + + "Could not append:" + "\ndefine( \'WP_CACHE_KEY_SALT\', " + "\'{0}:\' );".format(wo_domain) + "\nPlease add manually") except SiteError as e: Log.debug(self, str(e)) @@ -1473,10 +1634,12 @@ class WOSiteUpdateController(CementBaseController): db_user=data['wo_db_user'], db_password=data['wo_db_pass'], db_host=data['wo_db_host'], - ssl=True if check_site.is_ssl else False, php_version=check_php_version) + ssl=True if check_site.is_ssl else False, + php_version=check_php_version) else: updateSiteInfo(self, wo_domain, stype=stype, cache=cache, - ssl=True if check_site.is_ssl else False, php_version=check_php_version) + ssl=True if check_site.is_ssl else False, + php_version=check_php_version) Log.info(self, "Successfully updated site" " http://{0}".format(wo_domain)) return 0 @@ -1608,9 +1771,11 @@ class WOSiteDeleteController(CementBaseController): deleteSiteInfo(self, wo_domain) Log.info(self, "Deleted site {0}".format(wo_domain)) # else: - # Log.error(self, " site {0} does not exists".format(wo_domain)) + # Log.error(self, " site {0} does + # not exists".format(wo_domain)) else: - if (mark_db_delete_prompt or mark_webroot_delete_prompt or (mark_webroot_deleted and mark_db_deleted)): + if (mark_db_delete_prompt or mark_webroot_delete_prompt or + (mark_webroot_deleted and mark_db_deleted)): # TODO Delete nginx conf removeNginxConf(self, wo_domain) deleteSiteInfo(self, wo_domain) diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index fb779aa..818e23e 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -96,8 +96,8 @@ def setupdomain(self, data): Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") except CalledProcessError as e: Log.debug(self, "{0}".format(str(e))) - Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" - + Log.OKBLUE + "]") + Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + + Log.OKBLUE + "]") raise SiteError("created nginx configuration failed for site." " check with `nginx -t`") @@ -141,7 +141,8 @@ def setupdomain(self, data): def setupdatabase(self, data): wo_domain_name = data['site_name'] wo_random = (''.join(random.sample(string.ascii_uppercase + - string.ascii_lowercase + string.digits, 24))) + string.ascii_lowercase + + string.digits, 24))) wo_replace_dot = wo_domain_name.replace('.', '_') prompt_dbname = self.app.config.get('mysql', 'db-name') prompt_dbuser = self.app.config.get('mysql', 'db-user') @@ -242,7 +243,8 @@ def setupwordpress(self, data): wo_wp_email = self.app.config.get('wordpress', 'email') # Random characters wo_random = (''.join(random.sample(string.ascii_uppercase + - string.ascii_lowercase + string.digits, 15))) + string.ascii_lowercase + + string.digits, 15))) wo_wp_prefix = '' # wo_wp_user = '' # wo_wp_pass = '' @@ -312,8 +314,8 @@ def setupwordpress(self, data): "--dbuser=\'{2}\' --dbhost=\'{3}\' " .format(data['wo_db_name'], wo_wp_prefix, data['wo_db_user'], data['wo_db_host'] - ) - + "--dbpass=\'{0}\' " + ) + + "--dbpass=\'{0}\' " "--extra-php<