diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 17f0814..88cc71d 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -208,12 +208,10 @@ def post_pref(self, apt_packages, packages): '{0}/cloudflare.conf'.format(ngxcnf), 'cloudflare.mustache', data) - wo_nginx = open('{0}/' - 'map-wp-fastcgi-cache.conf'.format(ngxcnf), - encoding='utf-8', mode='w') - self.app.render((data), 'map-wp.mustache', - out=wo_nginx) - wo_nginx.close() + WOTemplate.tmpl_render(self, + '{0}/map-wp-fastcgi-cache.conf'.format( + ngxcnf), + 'map-wp.mustache', data) # Setup Nginx common directory if not os.path.exists('{0}'.format(ngxcom)): @@ -225,62 +223,40 @@ def post_pref(self, apt_packages, packages): data = dict() # Common Configuration - Log.debug(self, 'Writting the nginx configuration to ' - 'file /etc/nginx/common/locations-wo.conf') - wo_nginx = open('/etc/nginx/common/locations-wo.conf', - encoding='utf-8', mode='w') - self.app.render((data), 'locations.mustache', - out=wo_nginx) - wo_nginx.close() + WOTemplate.tmpl_render(self, + '{0}/locations-wo.conf' + .format(ngxcom), + 'locations.mustache', data) - Log.debug(self, 'Writting the nginx configuration to ' - 'file /etc/nginx/common/wpsubdir.conf') - wo_nginx = open('/etc/nginx/common/wpsubdir.conf', - encoding='utf-8', mode='w') - self.app.render((data), 'wpsubdir.mustache', - out=wo_nginx) - wo_nginx.close() + WOTemplate.tmpl_render(self, + '{0}/wpsubdir.conf' + .format(ngxcom), + 'wpsubdir.mustache', data) data = dict(upstream="php72") # PHP 7.2 conf - Log.debug(self, 'Writting the nginx configuration to ' - 'file /etc/nginx/common/php72.conf') - wo_nginx = open('/etc/nginx/common/php72.conf', - encoding='utf-8', mode='w') - self.app.render((data), 'php.mustache', - out=wo_nginx) - wo_nginx.close() + WOTemplate.tmpl_render(self, + '{0}/php72.conf' + .format(ngxcom), + 'php72.mustache', data) - Log.debug(self, 'Writting the nginx configuration to ' - 'file /etc/nginx/common/redis-php72.conf') - wo_nginx = open('/etc/nginx/common/redis-php72.conf', - encoding='utf-8', mode='w') - self.app.render((data), 'redis.mustache', - out=wo_nginx) - wo_nginx.close() + WOTemplate.tmpl_render(self, + '{0}/redis-php72.conf' + .format(ngxcom), + 'redis.mustache', data) - Log.debug(self, 'Writting the nginx configuration to ' - 'file /etc/nginx/common/wpcommon-php72.conf') - wo_nginx = open('/etc/nginx/common/wpcommon-php72.conf', - encoding='utf-8', mode='w') - self.app.render((data), 'wpcommon.mustache', - out=wo_nginx) - wo_nginx.close() + WOTemplate.tmpl_render(self, + '{0}/wpcommon-php72.conf' + .format(ngxcom), + 'wpcommon.mustache', data) - Log.debug(self, 'Writting the nginx configuration to ' - 'file /etc/nginx/common/wpfc-php72.conf') - wo_nginx = open('/etc/nginx/common/wpfc-php72.conf', - encoding='utf-8', mode='w') - self.app.render((data), 'wpfc.mustache', - out=wo_nginx) - wo_nginx.close() - - Log.debug(self, 'Writting the nginx configuration to ' - 'file /etc/nginx/common/wpsc-php72.conf') - wo_nginx = open('/etc/nginx/common/wpsc-php72.conf', - encoding='utf-8', mode='w') - self.app.render((data), 'wpsc.mustache', - out=wo_nginx) - wo_nginx.close() + WOTemplate.tmpl_render(self, + '{0}/wpfc-php72.conf' + .format(ngxcom), + 'wpfc.mustache', data) + WOTemplate.tmpl_render(self, + '{0}/wpsc-php72.conf' + .format(ngxcom), + 'wpsc.mustache', data) Log.debug(self, 'Writting the nginx configuration to ' 'file /etc/nginx/common/wprocket-php72.conf') diff --git a/wo/cli/templates/map-wp.mustache b/wo/cli/templates/map-wp.mustache index 4a663b8..22e62cb 100644 --- a/wo/cli/templates/map-wp.mustache +++ b/wo/cli/templates/map-wp.mustache @@ -54,6 +54,12 @@ map $request_uri $uri_no_cache { "~*/resetpass/" 1; } +map $http_user_agent $mobile_prefix { + default ""; + "~*iphone" -mobile; + "~*android" -mobile; +} + # do not cache requests with query strings map $is_args $query_no_cache { default 1; diff --git a/wo/cli/templates/wpce.mustache b/wo/cli/templates/wpce.mustache index 3df4508..f907397 100644 --- a/wo/cli/templates/wpce.mustache +++ b/wo/cli/templates/wpce.mustache @@ -10,10 +10,10 @@ location ~ \.php$ { include fastcgi_params; fastcgi_pass {{upstream}}; } -location ~* /cache/cache-enabler/\.html$ { +location ~ /wp-content/cache/cache-enabler/.*html$ { etag on; add_header Vary "Accept-Encoding, Cookie"; access_log off; log_not_found off; expires 10h; -} +} \ No newline at end of file diff --git a/wo/cli/templates/wprocket.mustache b/wo/cli/templates/wprocket.mustache index f2b9d10..d2be90d 100644 --- a/wo/cli/templates/wprocket.mustache +++ b/wo/cli/templates/wprocket.mustache @@ -3,14 +3,14 @@ # $cache_uri variable set in /etc/nginx/conf.d/map-wp.conf # Use cached or actual file if they exists, Otherwise pass request to WordPress location / { - try_files /wp-content/cache/wp-rocket/$http_host/$cache_uri/index$https_prefix.html $uri $uri/ /index.php$is_args$args; + try_files /wp-content/cache/wp-rocket/$http_host/$cache_uri/index${mobile_prefix}${https_prefix}.html /wp-content/cache/wp-rocket/$http_host/$cache_uri/index${https_prefix}.html $uri $uri/ /index.php$is_args$args; } location ~ \.php$ { try_files $uri =404; include fastcgi_params; - fastcgi_pass {{upstream}}; + fastcgi_pass {{upstream}}; } -location ~* /cache/wp-rocket/\.html$ { +location ~ /wp-content/cache/wp-rocket/.*html$ { etag on; add_header Vary "Accept-Encoding, Cookie"; access_log off;