diff --git a/.travis.yml b/.travis.yml index b98179f..a0d2dbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,4 +55,5 @@ script: - sudo wo info || sudo tail -n50 /var/log/wo/wordops.log - sudo tree -L 2 /etc/nginx - sudo cat /var/www/wpredis.net/wp-config.php - - sudo wo update --force || sudo tail -n50 /var/log/wo/wordops.log + - echo "127.0.0.1 wpredis.net" | sudo tee -a /etc/hosts + - curl -sL http://wpredis.net/robots.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 940ba32..fba993c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,15 +10,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### v3.9.6 - [Unreleased] -### v3.9.5.2 - 2019-06-16 +### v3.9.5.2 - 2019-06-17 #### Added - Non-interactive install/upgrade +- Argument `--force` with the command `wo update` +- Argument `-s|--silent` to perform non interactive installation + +#### Changed + +- robots.txt location block moved from locations-wo.conf to wpcommon.php #### Fixed -- WP_CACHE_KEY_SALT set twice +- WP_CACHE_KEY_SALT set twice with wpredis +- WordOps version check when using `wo update` +- robots.txt file download if not created ### v3.9.5.1 - 2019-05-10 diff --git a/install b/install index 4ef7cde..1c73fdc 100755 --- a/install +++ b/install @@ -7,7 +7,7 @@ # Copyright (c) 2019 - WordOps # This script is licensed under M.I.T # ------------------------------------------------------------------------- -# Version 3.9.5.2 - 2019-06-16 +# Version 3.9.5.2 - 2019-06-17 # ------------------------------------------------------------------------- readonly wo_version_old="2.2.3" readonly wo_version_new="3.9.5.2" diff --git a/wo/cli/plugins/update.py b/wo/cli/plugins/update.py index f708f11..07214e7 100644 --- a/wo/cli/plugins/update.py +++ b/wo/cli/plugins/update.py @@ -28,7 +28,7 @@ class WOUpdateController(CementBaseController): def default(self): filename = "woupdate" + time.strftime("%Y%m%d-%H%M%S") WODownload.download(self, [["https://raw.githubusercontent.com/" - "WordOps/WordOps/updating-configuration/install", + "WordOps/WordOps/master/install", "/tmp/{0}".format(filename), "update script"]]) if self.app.pargs.force: diff --git a/wo/cli/templates/locations.mustache b/wo/cli/templates/locations.mustache index 267891c..ba1d66f 100644 --- a/wo/cli/templates/locations.mustache +++ b/wo/cli/templates/locations.mustache @@ -6,17 +6,6 @@ location = /favicon.ico { log_not_found off; expires max; } -location = /robots.txt { -# Some WordPress plugin gererate robots.txt file -# Refer #340 issue - try_files $uri $uri/ /index.php$is_args$args @robots; - access_log off; - log_not_found off; -} -# fallback for robots.txt with default wordpress rules -location @robots { - return 200 "User-agent: *\nDisallow: /wp-admin/\nAllow: /wp-admin/admin-ajax.php\n"; -} # Cache static files location ~* \.(ogg|ogv|svg|svgz|eot|otf|woff|woff2|ttf|m4a|mp4|ttf|rss|atom|jpe?g|gif|cur|heic|png|tiff|ico|webm|mp3|aac|tgz|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf|swf|webp)$ { add_header "Access-Control-Allow-Origin" "*"; diff --git a/wo/cli/templates/wpcommon-php7.mustache b/wo/cli/templates/wpcommon-php7.mustache index 52054ad..d0ee50d 100644 --- a/wo/cli/templates/wpcommon-php7.mustache +++ b/wo/cli/templates/wpcommon-php7.mustache @@ -12,6 +12,17 @@ location = /wp-config.txt { access_log off; log_not_found off; } +location = /robots.txt { +# Some WordPress plugin gererate robots.txt file +# Refer #340 issue + try_files $uri $uri/ /index.php?$args @robots; + access_log off; + log_not_found off; +} +# fallback for robots.txt with default wordpress rules +location @robots { + return 200 "User-agent: *\nDisallow: /wp-admin/\nAllow: /wp-admin/admin-ajax.php\n"; +} # webp rewrite rules for jpg and png images # try to load alternative image.png.webp before image.png location /wp-content/uploads { diff --git a/wo/cli/templates/wpcommon.mustache b/wo/cli/templates/wpcommon.mustache index 8ddc377..581710c 100644 --- a/wo/cli/templates/wpcommon.mustache +++ b/wo/cli/templates/wpcommon.mustache @@ -12,6 +12,17 @@ location = /wp-config.txt { access_log off; log_not_found off; } +location = /robots.txt { +# Some WordPress plugin gererate robots.txt file +# Refer #340 issue + try_files $uri $uri/ /index.php?$args @robots; + access_log off; + log_not_found off; +} +# fallback for robots.txt with default wordpress rules +location @robots { + return 200 "User-agent: *\nDisallow: /wp-admin/\nAllow: /wp-admin/admin-ajax.php\n"; +} # webp rewrite rules for jpg and png images # try to load alternative image.png.webp before image.png location /wp-content/uploads {