update locations.conf

ee/cli/plugins/stack.py

@@ -383,6 +383,14 @@ class EEStackController(CementBaseController):
                     if EEVariables.ee_platform_codename == 'trusty' and (not
                         os.path.isfile("/etc/nginx/common/php7.conf")):
                         #data = dict()
+                        Log.debug(self, 'Writting the nginx configuration to '
+                              'file /etc/nginx/common/locations.conf')
+                        ee_nginx = open('/etc/nginx/common/locations.conf',
+                                    encoding='utf-8', mode='w')
+                        self.app.render((data), 'locations-php7.mustache',
+                                    out=ee_nginx)
+                        ee_nginx.close()
+
                         Log.debug(self, 'Writting the nginx configuration to '
                         'file /etc/nginx/common/php7.conf')
                         ee_nginx = open('/etc/nginx/common/php7.conf',
@@ -635,6 +643,14 @@ class EEStackController(CementBaseController):
                 if os.path.isdir("/etc/nginx/common") and (not
                     os.path.isfile("/etc/nginx/common/php7.conf")):
                     data = dict()
+                    Log.debug(self, 'Writting the nginx configuration to '
+                              'file /etc/nginx/common/locations.conf')
+                    ee_nginx = open('/etc/nginx/common/locations.conf',
+                                    encoding='utf-8', mode='w')
+                    self.app.render((data), 'locations-php7.mustache',
+                                    out=ee_nginx)
+                    ee_nginx.close()
+
                     Log.debug(self, 'Writting the nginx configuration to '
                       'file /etc/nginx/common/php7.conf')
                     ee_nginx = open('/etc/nginx/common/php7.conf',

ee/cli/templates/locations-php7.mustache

@@ -0,0 +1,68 @@
+# NGINX CONFIGURATION FOR COMMON LOCATION
+# DO NOT MODIFY, ALL CHANGES LOST AFTER UPDATE EasyEngine (ee)
+# Basic locations files
+location = /favicon.ico {
+  access_log off;
+  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?$args;
+  access_log off;
+  log_not_found off;
+}
+# Cache static files
+location ~* \.(ogg|ogv|svg|svgz|eot|otf|woff|mp4|ttf|css|rss|atom|js|jpg|jpeg|gif|png|ico|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf|swf)$ {
+  add_header "Access-Control-Allow-Origin" "*";
+  access_log off;
+  log_not_found off;
+  expires max;
+}
+# Security settings for better privacy
+# Deny hidden files
+location ~ /\.well-known {
+  allow all;
+}
+location ~ /\. {
+  deny all;
+  access_log off;
+  log_not_found off;
+}
+# Deny backup extensions & log files
+location ~* ^.+\.(bak|log|old|orig|original|php#|php~|php_bak|save|swo|swp|sql)$ {
+  deny all;
+  access_log off;
+  log_not_found off;
+}
+# Return 403 forbidden for readme.(txt|html) or license.(txt|html) or example.(txt|html)
+if ($uri ~* "^.+(readme|license|example)\.(txt|html)$") {
+  return 403;
+}
+# Status pages
+location /nginx_status {
+  stub_status on;
+  access_log off;
+  include common/acl.conf;
+}
+location ~ ^/(status|ping) {
+  include fastcgi_params;
+  fastcgi_pass php7;
+  include common/acl.conf;
+}
+# EasyEngine (ee) utilities
+# phpMyAdmin settings
+location /pma {
+  return 301 https://$host:22222/db/pma;
+}
+location /phpMyAdmin {
+  return 301 https://$host:22222/db/pma;
+}
+location /phpmyadmin {
+  return 301 https://$host:22222/db/pma;
+}
+# Adminer settings
+location /adminer {
+  return 301 https://$host:22222/db/adminer;
+}

ee/cli/templates/virtualconf-php7.mustache

@@ -43,7 +43,7 @@ server {
     {{^static}}include {{^hhvm}}{{#basic}}common/php7.conf;{{/basic}}{{#w3tc}}common/w3tc-php7.conf;{{/w3tc}}{{#wpfc}}common/wpfc-php7.conf;{{/wpfc}} {{#wpsc}}common/wpsc-php7.conf;{{/wpsc}}{{#wpredis}}common/redis-php7.conf;{{/wpredis}} {{/hhvm}}{{#hhvm}}{{#basic}}common/php-hhvm.conf;{{/basic}}{{#w3tc}}common/w3tc-hhvm.conf;{{/w3tc}}{{#wpfc}}common/wpfc-hhvm.conf;{{/wpfc}} {{#wpsc}}common/wpsc-hhvm.conf;{{/wpsc}}{{#wpredis}}common/redis-hhvm.conf;{{/wpredis}} {{/hhvm}}
     {{#wpsubdir}}include common/wpsubdir.conf;{{/wpsubdir}}{{/static}}
     {{#wp}}include common/wpcommon-php7.conf;{{/wp}}
-    {{^proxy}}include common/locations.conf;{{/proxy}}
+    {{^proxy}}include common/locations-php7.conf;{{/proxy}}
     {{^vma}}{{^rc}}include {{webroot}}/conf/nginx/*.conf;{{/rc}}{{/vma}}
     {{/proxy}}
 }