From a94dc67c2f3f1cac165c71819cfd230e82188813 Mon Sep 17 00:00:00 2001 From: Somthanat Wongsa Date: Mon, 15 May 2017 16:36:56 +0700 Subject: [PATCH 001/295] fix web_port->web_ssl_port --- install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl | 2 +- install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl | 2 +- install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl index f1ffc4c0..fb324e16 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_port%; + listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; root %docroot%/public; index index.php index.html index.htm; From 8677627ef3068f75af9e556516e4b1136fa1361e Mon Sep 17 00:00:00 2001 From: "Made I.T" Date: Tue, 12 Sep 2017 14:30:01 +0200 Subject: [PATCH 002/295] #1240 web/add/db/index.php double footer Include of footer.html is already in render_page function. --- web/add/db/index.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/add/db/index.php b/web/add/db/index.php index 9ca2cc7a..68f66b4a 100644 --- a/web/add/db/index.php +++ b/web/add/db/index.php @@ -127,6 +127,3 @@ render_page($user, $TAB, 'add_db'); // Flush session messages unset($_SESSION['error_msg']); unset($_SESSION['ok_msg']); - -// Footer -include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html'); From e93ef9389f61cabb53310395888907fcf9e419bd Mon Sep 17 00:00:00 2001 From: Alexandr Loskutov Date: Wed, 13 Sep 2017 19:05:12 +0300 Subject: [PATCH 003/295] Add .DS_Store to ignore patterns --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7e67c48b..6701a887 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.gzip *.gz .vscode +.DS_Store From 325595a2f37d06467a767f4563cdc39c4e6474c5 Mon Sep 17 00:00:00 2001 From: David Juan Ahullana Date: Thu, 14 Sep 2017 12:49:05 +0200 Subject: [PATCH 004/295] Added Magento web template (latest version, 2.1). --- .../templates/web/nginx/php5-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php5-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php5-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php5-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../5/templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../6/templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../7/templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ .../templates/web/nginx/php-fpm/magento.stpl | 198 ++++++++++++++++++ .../templates/web/nginx/php-fpm/magento.tpl | 194 +++++++++++++++++ 30 files changed, 5880 insertions(+) create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/magento.stpl create mode 100644 install/debian/7/templates/web/nginx/php5-fpm/magento.tpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/magento.stpl create mode 100644 install/debian/8/templates/web/nginx/php5-fpm/magento.tpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/rhel/5/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/rhel/6/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/rhel/7/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl create mode 100644 install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl create mode 100644 install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl diff --git a/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl b/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl b/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/debian/7/templates/web/nginx/php5-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl b/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl b/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/debian/8/templates/web/nginx/php5-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl b/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/rhel/5/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl b/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/rhel/6/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl b/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/rhel/7/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl new file mode 100644 index 00000000..f067f63d --- /dev/null +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl @@ -0,0 +1,198 @@ +server { + listen %ip%:%web_ssl_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + ssl on; + ssl_certificate %ssl_pem%; + ssl_certificate_key %ssl_key%; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl new file mode 100644 index 00000000..1a7e8118 --- /dev/null +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.tpl @@ -0,0 +1,194 @@ +server { + listen %ip%:%web_port%; + server_name %domain_idn% %alias_idn%; + + root %docroot%/pub; + index index.php; + autoindex off; + charset UTF-8; + error_page 404 403 = /errors/404.php; + add_header "X-UA-Compatible" "IE=Edge"; + + access_log /var/log/nginx/domains/%domain%.log combined; + access_log /var/log/nginx/domains/%domain%.bytes bytes; + error_log /var/log/nginx/domains/%domain%.error.log error; + + # PHP entry point for setup application + location ~* ^/setup($|/) { + root %docroot%; + + location ~ ^/setup/index.php { + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + location ~ ^/setup/(?!pub/). { + deny all; + } + + location ~ ^/setup/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + # PHP entry point for update application + location ~* ^/update($|/) { + root %docroot%; + + location ~ ^/update/index.php { + fastcgi_split_path_info ^(/update/index.php)(/.+)$; + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + include /etc/nginx/fastcgi_params; + } + + # Deny everything but index.php + location ~ ^/update/(?!pub/). { + deny all; + } + + location ~ ^/update/pub/ { + add_header X-Frame-Options "SAMEORIGIN"; + } + } + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location /pub/ { + location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { + deny all; + } + + alias %docroot%/pub/; + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /static/ { + # Uncomment the following line in production mode + # expires max; + + # Remove signature of the static files that is used to overcome the browser cache + location ~ ^/static/version { + rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + } + + if (!-f $request_filename) { + rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/ { + try_files $uri $uri/ /get.php?$args; + + location ~ ^/media/theme_customization/.*\.xml { + deny all; + } + + location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { + add_header Cache-Control "public"; + add_header X-Frame-Options "SAMEORIGIN"; + expires +1y; + try_files $uri $uri/ /get.php?$args; + } + + location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { + add_header Cache-Control "no-store"; + add_header X-Frame-Options "SAMEORIGIN"; + expires off; + try_files $uri $uri/ /get.php?$args; + } + + add_header X-Frame-Options "SAMEORIGIN"; + } + + location /media/customer/ { + deny all; + } + + location /media/downloadable/ { + deny all; + } + + location /media/import/ { + deny all; + } + + # PHP entry point for main application + location ~ (index|get|static|report|404|503)\.php$ { + try_files $uri =404; + + fastcgi_pass %backend_lsnr%; + fastcgi_buffers 1024 4k; + fastcgi_read_timeout 600s; + fastcgi_connect_timeout 600s; + + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include /etc/nginx/fastcgi_params; + } + + gzip on; + gzip_disable "msie6"; + + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/xml+rss + image/svg+xml; + gzip_vary on; + + # Banned locations (only reached if the earlier PHP entry point regexes don't match) + location ~* (\.php$|\.htaccess$|\.git) { + deny all; + } + + location /vstats/ { + alias %home%/%user%/web/%domain%/stats/; + include %home%/%user%/web/%domain%/stats/auth.conf*; + } + + include /etc/nginx/conf.d/phpmyadmin.inc*; + include /etc/nginx/conf.d/phppgadmin.inc*; + include /etc/nginx/conf.d/webmail.inc*; + + include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; +} From dac79fc691c9381a0036b58b3dd7e9404699d2e1 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:43:12 +0300 Subject: [PATCH 005/295] Update laravel.stpl --- install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f4925227a083a53706e88a396fe3dacd4f965640 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:45:12 +0300 Subject: [PATCH 006/295] Update laravel.stpl --- install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 05d598dfc24bdc4ea7c93f7c1e23ff6b0b136499 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:46:05 +0300 Subject: [PATCH 007/295] Update laravel.tpl --- install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl index 5ef66f98..4bca3866 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 3e37ced978647c7e0c15a339450b0ce0612dcba4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:48:00 +0300 Subject: [PATCH 008/295] Update laravel.tpl --- install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl index 4bca3866..5ef66f98 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.tpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; + root %docroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From cabf0f5ff3c015ec0b5e8aaf221442004ae54a41 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:48:28 +0300 Subject: [PATCH 009/295] Update laravel.stpl --- install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 591d91244ad114a4497e9ed70ec4357e0fff6449 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:49:31 +0300 Subject: [PATCH 010/295] Update laravel.stpl --- install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 80ea4b7bc6233a340ae73261514bddc4512c6f97 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:50:21 +0300 Subject: [PATCH 011/295] Update laravel.stpl --- install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 22595681243f4e421dd95d3781cb59d4c33a8fdf Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:51:13 +0300 Subject: [PATCH 012/295] Update laravel.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 965691199fed797818b17dca9fd5361444a39453 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:51:54 +0300 Subject: [PATCH 013/295] Update laravel.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 612fc103dd326984270f0fc691aae5a3a05c2622 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:52:43 +0300 Subject: [PATCH 014/295] Update laravel.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 76c83d4438b44e6a83a1970fb02949b55593a81d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:53:49 +0300 Subject: [PATCH 015/295] Update laravel.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 4fcc667ac9eba0313e70c147ecf560e7ef47f949 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:54:35 +0300 Subject: [PATCH 016/295] Update laravel.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 6e0675fcc65eedbe1b73e3a9a35704d02b61e8a2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:55:29 +0300 Subject: [PATCH 017/295] Update laravel.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a7c6ba799bd2f37dcd0dd3577388c0f2b8af5288 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:56:21 +0300 Subject: [PATCH 018/295] Update laravel.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 768d5b3cbec645969aa6e7095b847350ba691ce7 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:56:54 +0300 Subject: [PATCH 019/295] Update laravel.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 710873bc1e3ade60efecd70ac353f48ae35e9116 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:57:39 +0300 Subject: [PATCH 020/295] Update laravel.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 02bba8dc4defecebfd58e6ddfcac3e3dc97ef4dc Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 13:58:13 +0300 Subject: [PATCH 021/295] Update laravel.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl index fb324e16..b86450e0 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9223e957bfc1fbda784eca2a7239eeb2f0e38462 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:26:34 +0300 Subject: [PATCH 022/295] Update cms_made_simple.stpl --- install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 534fe622bbb78b2e295150fba4bdd2a1ba2fa1fd Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:26:55 +0300 Subject: [PATCH 023/295] Update codeigniter3.stpl --- install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From e4802fe13603db5a452e3d7004a2759905f62155 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:29:58 +0300 Subject: [PATCH 024/295] Update cms_made_simple.stpl --- .../debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 789fba6585535f020dcf390369d31b21fec50486 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:30:40 +0300 Subject: [PATCH 025/295] Update codeigniter2.stpl --- install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 5cb745ac34ba2f6f26d266a154bfb2eb8b58b1ec Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:33:31 +0300 Subject: [PATCH 026/295] Update codeigniter3.stpl --- install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From dcea9a5b6f437e6299723d44175d572773350113 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:33:42 +0300 Subject: [PATCH 027/295] Update datalife_engine.stpl --- .../debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a91f56976549754253343e178f1f5c111659d05b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:33:53 +0300 Subject: [PATCH 028/295] Update dokuwiki.stpl --- install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 4cd21d92bef838b26b24e607177882c5d328a341 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:34:05 +0300 Subject: [PATCH 029/295] Update drupal6.stpl --- install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 19fab6463fdd3ea81e1cea4f761129b683318642 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:34:16 +0300 Subject: [PATCH 030/295] Update drupal7.stpl --- install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 650002876c1689bffad8036c0dd0b09f69b1e585 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:34:26 +0300 Subject: [PATCH 031/295] Update drupal8.stpl --- install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 678cc4694c1cc0ea9d5ddf7ba672cd2c708105aa Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:34:40 +0300 Subject: [PATCH 032/295] Update joomla.stpl --- install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From aec4aeeeda23774f7fc11eaf35d008f5c260945f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:34:54 +0300 Subject: [PATCH 033/295] Update modx.stpl --- install/debian/7/templates/web/nginx/php5-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 6fc0b7ee9e3f4fcfc51a66fe96fa24ff34dcd341 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:35:07 +0300 Subject: [PATCH 034/295] Update moodle.stpl --- install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl b/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 2e2f552aa87935a8478b4200b24001baf6c5f436 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:35:21 +0300 Subject: [PATCH 035/295] Update owncloud.stpl --- install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 57f3e84ef618069cb65965e449cad2831807b67b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:35:34 +0300 Subject: [PATCH 036/295] Update piwik.stpl --- install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 97022c676650952bf79b7a33d355803a6863846f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:35:46 +0300 Subject: [PATCH 037/295] Update pyrocms.stpl --- install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 1acfb3ec9e17aef5ad53bc3a0f45428e60de6ace Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:35:59 +0300 Subject: [PATCH 038/295] Update wordpress.stpl --- install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 0893f511bd47d15fc9865ae9af004821ed9790dd Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:36:10 +0300 Subject: [PATCH 039/295] Update wordpress2.stpl --- install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 140f7f0285592f92df5b89cdc68a68ffc3f19638 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:42:08 +0300 Subject: [PATCH 040/295] Update cms_made_simple.stpl --- .../debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b5141a62f02d3d69347945dcbbb77e9c662348db Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:42:12 +0300 Subject: [PATCH 041/295] Update codeigniter2.stpl --- install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 4f53e1d9f8737074cd9f9bc37553f4899140b06f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:42:29 +0300 Subject: [PATCH 042/295] Update codeigniter3.stpl --- install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 4b36618e98cf41af47408b177c01a49b5ac862b7 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:42:37 +0300 Subject: [PATCH 043/295] Update datalife_engine.stpl --- .../debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 95132e6b77d8126bdaeb2651c4f6d01733cd2e97 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:43:00 +0300 Subject: [PATCH 044/295] Update dokuwiki.stpl --- install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 15857f011898b77315692215aa8f91024dee6cfe Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:43:09 +0300 Subject: [PATCH 045/295] Update drupal6.stpl --- install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f84725ee103c56eaeac74cb8c38c5deca587ef33 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:43:16 +0300 Subject: [PATCH 046/295] Update drupal7.stpl --- install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From ab5f357e261e632c761f21c898034c7e8e38c2a0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:43:28 +0300 Subject: [PATCH 047/295] Update drupal8.stpl --- install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 257c08c25ee74908222514be8f0c592d2c45c2fb Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:43:41 +0300 Subject: [PATCH 048/295] Update joomla.stpl --- install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 36f3d92198080ee72d097d8dac20762a8b0cbbd0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:43:46 +0300 Subject: [PATCH 049/295] Update modx.stpl --- install/debian/8/templates/web/nginx/php5-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c806e4dd970b93a287b4e088b21773cd38367fea Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:43:51 +0300 Subject: [PATCH 050/295] Update moodle.stpl --- install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl b/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 5b1d185b8bdcdc9505cba21bddc79ff9e15b3bb6 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:44:10 +0300 Subject: [PATCH 051/295] Update owncloud.stpl --- install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From bf01d4890de727567d3f864b0a5d3b6882a4f5cb Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:44:14 +0300 Subject: [PATCH 052/295] Update piwik.stpl --- install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 077273fc80d6cf00726807277653ce560df984e6 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:44:20 +0300 Subject: [PATCH 053/295] Update pyrocms.stpl --- install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 091f34038a815dc00bcc9eea63d2f2506388c0ca Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:44:40 +0300 Subject: [PATCH 054/295] Update wordpress.stpl --- install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 801fd75e2c3523831c95089dfb5af369e412c72a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:44:46 +0300 Subject: [PATCH 055/295] Update wordpress2.stpl --- install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From e3a1c3cb54d3b6158c9083ce431ad47c5b411a4d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:51:26 +0300 Subject: [PATCH 056/295] Update cms_made_simple.stpl --- install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 67b58bf830f04411adc07e8368c8fc396618233d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:51:34 +0300 Subject: [PATCH 057/295] Update codeigniter2.stpl --- install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 0bc2e06fb57ae6b6fa7d7cb66e060845bb4da50e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:51:38 +0300 Subject: [PATCH 058/295] Update codeigniter3.stpl --- install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 3114e343689b9ccd052fd6c7f5018d072dc5d3bc Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:51:42 +0300 Subject: [PATCH 059/295] Update datalife_engine.stpl --- install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 4d2e658c6d7ff4cdaeab68a78842e427c16e96eb Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:53:09 +0300 Subject: [PATCH 060/295] Update dokuwiki.stpl --- install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 03efba6f35639afa5b8a86dd9e2901f5c0478a9b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:53:21 +0300 Subject: [PATCH 061/295] Update drupal6.stpl --- install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From ec40e373c7d43d7a65a71f3da1fcaeaff5274b58 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:53:28 +0300 Subject: [PATCH 062/295] Update drupal7.stpl --- install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9343acbaed5cb1dd557ff011be85911c0056d447 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:53:32 +0300 Subject: [PATCH 063/295] Update drupal8.stpl --- install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a86b83e43d437624e787aabd2e1cde640ea423bd Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:53:54 +0300 Subject: [PATCH 064/295] Update joomla.stpl --- install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 38a132ff0197cb5880f3ed020b7540849ee895ca Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:54:01 +0300 Subject: [PATCH 065/295] Update modx.stpl --- install/rhel/5/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From d05d92be3614a89800a0820f7d981c0f10ed01cf Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:54:09 +0300 Subject: [PATCH 066/295] Update moodle.stpl --- install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 75c284800825d03062293f1ca752ea271c12908f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:54:29 +0300 Subject: [PATCH 067/295] Update owncloud.stpl --- install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 7c49c57afbd04e1ab17e164424359b72a2010833 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:54:33 +0300 Subject: [PATCH 068/295] Update piwik.stpl --- install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 1d2e9667ffe476733c2205bf21921c942f23619b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:54:46 +0300 Subject: [PATCH 069/295] Update pyrocms.stpl --- install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 2b796ef911efada8993042396b453fcd9358c4e5 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:54:50 +0300 Subject: [PATCH 070/295] Update wordpress.stpl --- install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f99e0b2894dde96f9c9278f55c5f3135091b4126 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 14:54:55 +0300 Subject: [PATCH 071/295] Update wordpress2.stpl --- install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From e1f21a24ed9cd1d9c3cb4e970bc8a3fc3f349bf5 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:05 +0300 Subject: [PATCH 072/295] Update cms_made_simple.stpl --- install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a5c5d30fc823e2bbc511978b51edca9b835e8cfc Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:09 +0300 Subject: [PATCH 073/295] Update codeigniter2.stpl --- install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From cfb98568f2652c17ab156f8ea6792c97affd5828 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:15 +0300 Subject: [PATCH 074/295] Update codeigniter3.stpl --- install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 07392f6bba5855b5ac45a553a468dc0c2cf02851 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:19 +0300 Subject: [PATCH 075/295] Update datalife_engine.stpl --- install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 366becacd66ccdf7b85d48d921688951e36468a6 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:24 +0300 Subject: [PATCH 076/295] Update dokuwiki.stpl --- install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From d7452a46ed20009e15ec7f9d0838e73b5521898e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:27 +0300 Subject: [PATCH 077/295] Update drupal6.stpl --- install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b0a3b46361f9e5c160ffbc27fec9df7ee71b68ee Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:31 +0300 Subject: [PATCH 078/295] Update drupal7.stpl --- install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 10e6ab1a3b0f163f0dbec7274989ebae8520730b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:39 +0300 Subject: [PATCH 079/295] Update drupal8.stpl --- install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9c1b914177e8a64fba80bd61f840a1dd0cab8255 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:47 +0300 Subject: [PATCH 080/295] Update joomla.stpl --- install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From dacb9c6c82a384e38b6f6d82b634d7c81d847388 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:02:59 +0300 Subject: [PATCH 081/295] Update modx.stpl --- install/rhel/6/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f8df0a5ce2576c3602debcc9363c20d32a7c3b85 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:03:06 +0300 Subject: [PATCH 082/295] Update moodle.stpl --- install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 74a57d5c8c0a12cded7eebaaca4a8c1771fd8df7 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:03:11 +0300 Subject: [PATCH 083/295] Update owncloud.stpl --- install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 63ed958c930c1568719eab3674b8141309dc1555 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:03:17 +0300 Subject: [PATCH 084/295] Update piwik.stpl --- install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From cc4cffbe82158c290c20782d3c6c780106651c3e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:03:27 +0300 Subject: [PATCH 085/295] Update pyrocms.stpl --- install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f56bdc585402a483cc1666277298b5cb6f897142 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:03:32 +0300 Subject: [PATCH 086/295] Update wordpress.stpl --- install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 178f495819c3c1489dbb75a251f721465317d4cd Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:03:39 +0300 Subject: [PATCH 087/295] Update wordpress2.stpl --- install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9869aab1771553ba9c00050fb301badd802f5bd5 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:09:10 +0300 Subject: [PATCH 088/295] Update codeigniter2.stpl --- install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 5c4be6d6553c03e8202a98661d1f05be3b099755 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:09:20 +0300 Subject: [PATCH 089/295] Update datalife_engine.stpl --- install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 18c0e9ee7e6081befaac8cdced6dc972b0312e82 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:09:43 +0300 Subject: [PATCH 090/295] Update dokuwiki.stpl --- install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 2b4c5a1ff3cffce93ca545d663d6312e1ba85f9b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:10:41 +0300 Subject: [PATCH 091/295] Update drupal6.stpl --- install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 7d587715373679c5f47eedfc90aef89fa19c1205 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:10:45 +0300 Subject: [PATCH 092/295] Update drupal7.stpl --- install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 80780e925ee60fe8a7101313ce6b48b1f4dc2602 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:10:55 +0300 Subject: [PATCH 093/295] Update drupal8.stpl --- install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 395a291024a634421034212ee86ea490799fdc17 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:12:22 +0300 Subject: [PATCH 094/295] Update joomla.stpl --- install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From d0e6b571f21d79ac4b8495bb181eaaa19302bd78 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:13:04 +0300 Subject: [PATCH 095/295] Update modx.stpl --- install/rhel/7/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 30fc2a81dbab65438be1faf51130236cb6de4470 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:13:11 +0300 Subject: [PATCH 096/295] Update moodle.stpl --- install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl b/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From cf51d5cb756ea810b279b8fb0784dafc3923536a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:13:48 +0300 Subject: [PATCH 097/295] Update owncloud.stpl --- install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 2bb67e09a8dd3ae69128ebd5dbd5b8b477a56dbd Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:13:51 +0300 Subject: [PATCH 098/295] Update piwik.stpl --- install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 615f1668ca39f7a721fae9c5b6ab9eca525a0150 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:13:55 +0300 Subject: [PATCH 099/295] Update pyrocms.stpl --- install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9df8db3baa3f0e57a168f63393127561d847f3ce Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:14:26 +0300 Subject: [PATCH 100/295] Update wordpress.stpl --- install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From cd62426b007bc616f0d1a0786547ce7b11a4191b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:14:34 +0300 Subject: [PATCH 101/295] Update wordpress2.stpl --- install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b791bb3051ea529e508bfaf0cafcacd2c1039437 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:50:29 +0300 Subject: [PATCH 102/295] Update codeigniter2.stpl --- .../ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f127c402b1e5a605ac0c4aeabd7894a25ad0ab39 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:50:39 +0300 Subject: [PATCH 103/295] Update codeigniter3.stpl --- .../ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 033315b9cbfb579e0599f3227a5068e3e536086a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:50:52 +0300 Subject: [PATCH 104/295] Update datalife_engine.stpl --- .../12.04/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9fc4f635af3e0ad28a964065654331400876e3da Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:51:01 +0300 Subject: [PATCH 105/295] Update dokuwiki.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f86d6f5dfbeb55c7ec5a929affbdf900db9c5f9f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:51:07 +0300 Subject: [PATCH 106/295] Update drupal6.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 44656266af10cbb6bf9d5586b476f3b6226865c7 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:51:25 +0300 Subject: [PATCH 107/295] Update drupal7.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From d3ec05127c6848da7a61f6c0d1645891b7f4d499 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:51:29 +0300 Subject: [PATCH 108/295] Update drupal8.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 5822d5d4cc42bffdcba8b0321e59c699b911549b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:51:32 +0300 Subject: [PATCH 109/295] Update joomla.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 2c43867999ee95bfad4cc4a1b6aafddffd5db8ac Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:51:47 +0300 Subject: [PATCH 110/295] Update modx.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 22a166f584c249587220b18969409dd7b9879bd5 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:51:50 +0300 Subject: [PATCH 111/295] Update moodle.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c58b3e873fc1449a9e25d92a3775010a643783dc Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:51:54 +0300 Subject: [PATCH 112/295] Update owncloud.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 29c661f75fa6dc447d9b449f301fcf27ac37e534 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:52:14 +0300 Subject: [PATCH 113/295] Update piwik.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 805c7c92bb5c612c2ba81ee78f942687606881f2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:52:16 +0300 Subject: [PATCH 114/295] Update pyrocms.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 14726dc48ef5498984d6ef5953c2602386dd4188 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:53:46 +0300 Subject: [PATCH 115/295] Update wordpress.stpl --- install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 788beb05cfd61843c8db85f7507899e6b9d4a129 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:53:50 +0300 Subject: [PATCH 116/295] Update wordpress2.stpl --- .../ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 68e2ea0f5eb96b2daf385104f84073a14fa7a53e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:54:05 +0300 Subject: [PATCH 117/295] Update cms_made_simple.stpl --- .../12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8b2147631d10fde97c62a62b4c89bb44869b6683 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:55:24 +0300 Subject: [PATCH 118/295] Update wordpress2.stpl --- .../ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl index 310ef7aa..da5b75e5 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From db4428e43bd679f2f47cd3853ad3badb06d3bbf2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 15:55:33 +0300 Subject: [PATCH 119/295] Update wordpress2.stpl --- .../ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c7cf3997bb91f91301f793f84a36c2ef6f78cdcc Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:01:02 +0300 Subject: [PATCH 120/295] Update cms_made_simple.stpl --- .../12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 43d77fa6ed2e9c32807c4b112b6c6b74219f3c61 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:01:06 +0300 Subject: [PATCH 121/295] Update codeigniter2.stpl --- .../ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 49ae3a693c0cd13de46bbe97fb7388d999c8dba1 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:01:12 +0300 Subject: [PATCH 122/295] Update codeigniter3.stpl --- .../ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b0e6f32be42df0579f6f79eaf265b85ddf1cfbe8 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:01:17 +0300 Subject: [PATCH 123/295] Update datalife_engine.stpl --- .../12.10/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From de08af75378be5ae3dd09c8f12aebfe7ba25c63e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:01:25 +0300 Subject: [PATCH 124/295] Update dokuwiki.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From e21696398870df8037419e1f3d4c8a635c252f00 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:02:01 +0300 Subject: [PATCH 125/295] Update drupal6.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c17698f67040f89c7fc91e7305e6d1bb2ca26dc9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:02:06 +0300 Subject: [PATCH 126/295] Update drupal7.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 599e9eaf0b202d90d3c8e04e92f9b987e5fe821e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:02:10 +0300 Subject: [PATCH 127/295] Update drupal8.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 0896173ec3fd25767815974e64e119db7d3f4ef0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:02:15 +0300 Subject: [PATCH 128/295] Update joomla.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 47c239a960e15d8ecafe24ebf50b9dfd3730c97b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:02:25 +0300 Subject: [PATCH 129/295] Update modx.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 160d7080a7b5455e45164bf8ec904153d1baf501 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:02:49 +0300 Subject: [PATCH 130/295] Update moodle.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From ab91b0e82a7369e0e4f90865bcf69edbe6be9dda Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:02:53 +0300 Subject: [PATCH 131/295] Update owncloud.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 37b85a6e3bfdb5d1031dffddbb698c121fe56546 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:03:11 +0300 Subject: [PATCH 132/295] Update piwik.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 06b790292ed43d727b533e87157f904a8ae9dec9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:03:17 +0300 Subject: [PATCH 133/295] Update pyrocms.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b22e85f81e0efb7d6eb28297ee231992264d7fce Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:03:33 +0300 Subject: [PATCH 134/295] Update wordpress.stpl --- install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 045c35ba1f9ca315331e58fdad0844b57d00b34c Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:03:37 +0300 Subject: [PATCH 135/295] Update wordpress2.stpl --- .../ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 7b20cf1959f480721434d6697789e0a6a57f0879 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:12:20 +0300 Subject: [PATCH 136/295] Update cms_made_simple.stpl --- .../13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 3bbcd800e9ca8d294b9d857b2145887f472600c1 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:12:25 +0300 Subject: [PATCH 137/295] Update codeigniter2.stpl --- .../ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From d6626b9071ee7c5dc6407101b73034b5f66efaa9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:12:41 +0300 Subject: [PATCH 138/295] Update codeigniter3.stpl --- .../ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f75d026a93802f723bb8d7f22bb0b6656dd245ba Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:12:45 +0300 Subject: [PATCH 139/295] Update datalife_engine.stpl --- .../13.04/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a8c7f115252d50deee8dffe3273dd1fa0e48eeed Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:13:01 +0300 Subject: [PATCH 140/295] Update dokuwiki.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9a3b9f0e1c9e70064b3165cf08976a7bc5dd8418 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:13:05 +0300 Subject: [PATCH 141/295] Update drupal6.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 35c83b430d62e39dfee0a9696256273e3d2a2ac7 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:13:09 +0300 Subject: [PATCH 142/295] Update drupal7.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 1c4d4e81bfea25fe718bf1d1e74086639f264250 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:13:25 +0300 Subject: [PATCH 143/295] Update drupal8.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From ac32de9db1a939276f24797ba4c3bd741124cf6a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:13:30 +0300 Subject: [PATCH 144/295] Update joomla.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c1f14be7db42d58c510f0bda5cbdd9d1d4472262 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:13:40 +0300 Subject: [PATCH 145/295] Update modx.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From af93fa577fdbd1a2de712a34eb5f9d249d954ec8 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:14:23 +0300 Subject: [PATCH 146/295] Update moodle.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From d639db7926afebc4c0b249b3031e581cc94c1ac0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:14:43 +0300 Subject: [PATCH 147/295] Update owncloud.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 2ef0624ffca36af5e920942d0b7de1894a150650 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:15:05 +0300 Subject: [PATCH 148/295] Update piwik.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 730eff38d2e7ab4c4ad7ceb107ed05fbd6c1b219 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:15:09 +0300 Subject: [PATCH 149/295] Update pyrocms.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From ca90a3d7f850354174d336dd0653cc1797640217 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:15:22 +0300 Subject: [PATCH 150/295] Update wordpress.stpl --- install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 80edce7f03ac983e43606378e6772c3fc3c7d218 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:15:27 +0300 Subject: [PATCH 151/295] Update wordpress2.stpl --- .../ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f5e6614f38eb71869664e6a4128e2549b73656b4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:30:37 +0300 Subject: [PATCH 152/295] Update cms_made_simple.stpl --- .../13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From d82ecfde41055c9b52e4217cfebacc2272aef24e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:31:08 +0300 Subject: [PATCH 153/295] Update codeigniter2.stpl --- .../ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 95bc2a64a97bd0f98d338a64a7a745c2eed8a2ed Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:31:15 +0300 Subject: [PATCH 154/295] Update codeigniter3.stpl --- .../ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 7fcb88654fb30fdab11cc16b46d373492e8b7c63 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:39:56 +0300 Subject: [PATCH 155/295] Update datalife_engine.stpl --- .../13.10/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8d237fa4370561fc7acbac814edd68e7a0a12da9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:40:10 +0300 Subject: [PATCH 156/295] Update dokuwiki.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9e84670bdc4a207140597d685381215b5b5a0d89 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:40:16 +0300 Subject: [PATCH 157/295] Update drupal6.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 6e2e7870633f6ae4691da4a641745b93ce21a78a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:40:42 +0300 Subject: [PATCH 158/295] Update drupal7.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 37e86bf392269e3a8ca15bf1b04d4445a93e7b61 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:40:46 +0300 Subject: [PATCH 159/295] Update drupal8.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From fca902768e259fe370346c4013c256a928283ea0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:40:52 +0300 Subject: [PATCH 160/295] Update joomla.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 4d51d52405a9d01a16ac913ff768d9fd47c5ed87 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:41:33 +0300 Subject: [PATCH 161/295] Update modx.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 68b40ae722093e0ee2ea9bc5d474981458f3dea2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:41:38 +0300 Subject: [PATCH 162/295] Update moodle.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 5e1affd38c9294ef79de3136e2428f6ba51f595f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:41:44 +0300 Subject: [PATCH 163/295] Update owncloud.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 6bbf3560b7e3c2a1ff5ce41151a3f26cf396b7a4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:42:20 +0300 Subject: [PATCH 164/295] Update piwik.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8648bcfe18c0d960626974df921fb27cbbc8c80f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:42:28 +0300 Subject: [PATCH 165/295] Update pyrocms.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 7d16cc2d92e56e3e0bcec672808efd161cee43cc Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:42:31 +0300 Subject: [PATCH 166/295] Update wordpress.stpl --- install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 21df33ccfe916724e0484b00c7b1d2bd0416fd04 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 16:42:36 +0300 Subject: [PATCH 167/295] Update wordpress2.stpl --- .../ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a0b5e5578acca830e0aa25badb325fed028ee32a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:01:44 +0300 Subject: [PATCH 168/295] Update cms_made_simple.stpl --- .../14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 31ae6133b038fc81b502a0def91399c9fd7e4fb5 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:01:59 +0300 Subject: [PATCH 169/295] Update codeigniter2.stpl --- .../ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c9cb7ae9974b8e0e55a9b72e3d56d34ac7d1b3b9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:02:09 +0300 Subject: [PATCH 170/295] Update codeigniter3.stpl --- .../ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f7e81c118d743c528c27c80a5c949ab63285e7e2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:02:29 +0300 Subject: [PATCH 171/295] Update datalife_engine.stpl --- .../14.04/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c7e075fdd1c43b3e4be6c7253b9a7bea457c25b0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:02:49 +0300 Subject: [PATCH 172/295] Update dokuwiki.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 3e858942955288abb1d2257eda79cf64cb1ff173 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:03:56 +0300 Subject: [PATCH 173/295] Update drupal6.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 01cf1f793a48f1844656123653bbe04c8205a6ff Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:04:04 +0300 Subject: [PATCH 174/295] Update drupal7.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 7550ac5561ed789b5b4f112a9693979e02f15e9e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:04:13 +0300 Subject: [PATCH 175/295] Update drupal8.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 26ade6169a945ada272383dc37132c30675f0fd4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:04:49 +0300 Subject: [PATCH 176/295] Update joomla.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From e3f3a48db3c0a39d1a4c9035a932f84d9c0fba4d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:04:58 +0300 Subject: [PATCH 177/295] Update modx.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From fa366e9858d91ada7e24aa668f650f2604e9771c Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:05:17 +0300 Subject: [PATCH 178/295] Update moodle.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 3b7ea00218177e508d755537ab2d25fa93edebb2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:05:25 +0300 Subject: [PATCH 179/295] Update owncloud.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f9e3a6be5c3779fd4ada4941cb03b3bcdec1d947 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:05:35 +0300 Subject: [PATCH 180/295] Update piwik.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8bb4f52295f253d9f137c7840c22977b28a5cae0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:06:04 +0300 Subject: [PATCH 181/295] Update pyrocms.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 0fa48b90ee1eccbc3c1f657af0f670df98915733 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:06:12 +0300 Subject: [PATCH 182/295] Update wordpress.stpl --- install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 4a30dc41b20835ce35fd7df767099fa90254665b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:06:19 +0300 Subject: [PATCH 183/295] Update wordpress2.stpl --- .../ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From d2a6edc5fa9cc4cc7c3ec80a2d7275060b3a30db Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:15:32 +0300 Subject: [PATCH 184/295] Update cms_made_simple.stpl --- .../14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From e98e52231e1ea9d1e4d218434ad01551786ef3e1 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:15:41 +0300 Subject: [PATCH 185/295] Update codeigniter2.stpl --- .../ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 57c05a4be074dc8a1b2c5331ad2c343f260040ef Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:15:51 +0300 Subject: [PATCH 186/295] Update codeigniter3.stpl --- .../ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 565a4460cdc82f6211b35c66f83663b95b5b4a31 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:17:07 +0300 Subject: [PATCH 187/295] Update datalife_engine.stpl --- .../14.10/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 5b4c3c56e0f1a4cfb8539ca889ae791b4a1ebf7a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:17:14 +0300 Subject: [PATCH 188/295] Update dokuwiki.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 0be57f2b30c250aad3c4bb1d1caa032c2cd2b538 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:17:20 +0300 Subject: [PATCH 189/295] Update drupal6.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b53d703b955df0f372a5bf2b02832070e59b9155 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:20:13 +0300 Subject: [PATCH 190/295] Update drupal7.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From e16bef6dfe2f998d965fe245f8e653d0db19299f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:20:16 +0300 Subject: [PATCH 191/295] Update drupal8.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8aee44747724029a765eb5dbb3d2d4ebecfa2e29 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:20:19 +0300 Subject: [PATCH 192/295] Update joomla.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9d73486ab91fe7c1d5f61c81c29d6c98ac5e2294 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:21:22 +0300 Subject: [PATCH 193/295] Update modx.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 7c03a82506b936fd5e55e0febc0bd0d078b19b03 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:21:27 +0300 Subject: [PATCH 194/295] Update moodle.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 52fea5c4356dc95d271c3face2ad772174b7d173 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:21:34 +0300 Subject: [PATCH 195/295] Update owncloud.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 92b90de5d2ddef7801f6fd9757f2d566059463ff Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:22:24 +0300 Subject: [PATCH 196/295] Update wordpress2.stpl --- .../ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8e18313104e0c6fad65d94876cb9393269b561f0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:22:28 +0300 Subject: [PATCH 197/295] Update wordpress.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 49b1aaa455ca77c5da57d956086172417f73bb5e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:22:31 +0300 Subject: [PATCH 198/295] Update pyrocms.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c83cba634a699e1f6e435c906be106a158d11341 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:22:36 +0300 Subject: [PATCH 199/295] Update piwik.stpl --- install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 5cae2d7ae3fe2d007ba7623a6c5306893f5b7c08 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:24:58 +0300 Subject: [PATCH 200/295] Update wordpress2.stpl --- .../ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl index 310ef7aa..da5b75e5 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 35757f2fc6da1867579917e5864dffbf7d409680 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:25:10 +0300 Subject: [PATCH 201/295] Update wordpress2.stpl --- .../ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 1e5fa6d767e1a0ae7b61e270d67e848b2105d901 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:57:47 +0300 Subject: [PATCH 202/295] Update cms_made_simple.stpl --- .../15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 0e5c971f266ccd96b177985b0022d106614d9139 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 17:57:56 +0300 Subject: [PATCH 203/295] Update codeigniter2.stpl --- .../ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 290cd430ad391d2a9499b928eba3b6a0c9846862 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:02:36 +0300 Subject: [PATCH 204/295] Update codeigniter3.stpl --- .../ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 31f55e1ac51186b2fa5a7c5cfa321b3af88da9ee Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:02:44 +0300 Subject: [PATCH 205/295] Update datalife_engine.stpl --- .../15.04/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a5e90a3e472ad2c50129e35410a3f0e2f0631b49 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:03:13 +0300 Subject: [PATCH 206/295] Update dokuwiki.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b95e6364a7289d57afd8b2de10e06eb2d48c5092 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:03:28 +0300 Subject: [PATCH 207/295] Update drupal6.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From cfb2b083d9be3fd92accf819edfaeeaa9791a0c9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:03:51 +0300 Subject: [PATCH 208/295] Update drupal7.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl index 6f150bf1..bd9a51e1 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a501456fb14e5f7a1e8fff70e66b6eb2156aa901 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:03:55 +0300 Subject: [PATCH 209/295] Update drupal8.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 77f4f125a8737bcba16f1373c4103a905a2dd263 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:04:00 +0300 Subject: [PATCH 210/295] Update joomla.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f12df4d2f6a33cc5fe1d76a1fbc96b862ee48698 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:04:31 +0300 Subject: [PATCH 211/295] Update modx.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 7c7b90013195e59e4bce2e7fc68eec93eea7fc3f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:04:42 +0300 Subject: [PATCH 212/295] Update moodle.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 2f77b35663a3c6893047be5d593a282b0422b71d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:04:47 +0300 Subject: [PATCH 213/295] Update owncloud.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 66f0c6d388a787b3ebb385b2442428af158b0888 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:05:37 +0300 Subject: [PATCH 214/295] Update piwik.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 210271dcdf00bf2b1799c2a61b16de1c2051b6a8 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:05:40 +0300 Subject: [PATCH 215/295] Update pyrocms.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b4833af5b04d0d1df9f0bd42801f25de5867c307 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:05:43 +0300 Subject: [PATCH 216/295] Update wordpress.stpl --- install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b4925a74af728f32f4a1c344fe44ab1fc38a476b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:05:50 +0300 Subject: [PATCH 217/295] Update wordpress2.stpl --- .../ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 2d333214bb9f2aa9826931268ca7e710d026ae4f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:12:41 +0300 Subject: [PATCH 218/295] Update cms_made_simple.stpl --- .../15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index e6633ede..30392a01 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8f841bb6df5987433dc4d9d97147444e606d78e4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:12:44 +0300 Subject: [PATCH 219/295] Update codeigniter2.stpl --- .../ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl index 821534be..485ea2ce 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From de45d52712dcffa28bb640e3592df0b87f500bdf Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:12:49 +0300 Subject: [PATCH 220/295] Update codeigniter3.stpl --- .../ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl index d4a69b9b..52c13c6a 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c6696898c8a309614f97a27383ed392fd7661c10 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:14:45 +0300 Subject: [PATCH 221/295] Update datalife_engine.stpl --- .../15.10/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 77f18507..7c24a5a6 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 1817b8c8b7d58b1c6c21ecc6220f86c1b94540d6 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:14:51 +0300 Subject: [PATCH 222/295] Update dokuwiki.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl index 41b70e91..42eece85 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 1884955b9f48934f4eed5a384827b0036ef17b4e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:14:59 +0300 Subject: [PATCH 223/295] Update drupal6.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl index b240b2e0..f7bace20 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 4c47e972be515a73810d202befca2ee1d9e7137f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:17:25 +0300 Subject: [PATCH 224/295] Update drupal8.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl index e234feee..ce40b82d 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 94a660b64b1216963b871349c86cbc5b12590245 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:17:31 +0300 Subject: [PATCH 225/295] Update joomla.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl index 09a73c83..5ffde607 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8054d8d3f696bd401c89a62ff91f8933771f3b10 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:17:40 +0300 Subject: [PATCH 226/295] Update modx.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl index ddd87f3e..c9d99e08 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 5b83b3b0f41076eb0f9396f156224920335fb3b2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:18:41 +0300 Subject: [PATCH 227/295] Update moodle.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl index 2ad2cac5..4e2415ad 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 86a71659e24703221f50e16974160b2f3e6ed087 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:18:48 +0300 Subject: [PATCH 228/295] Update owncloud.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl index 5831d44b..b4503d89 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From ccb343224444f92e8b02da654a580a49fcf603af Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:18:56 +0300 Subject: [PATCH 229/295] Update piwik.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl index 1da13092..1f8fa3ee 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 11785833bb8af46595e1feb17120d2672d82a4bd Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:21:18 +0300 Subject: [PATCH 230/295] Update pyrocms.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl index ef7b01f0..51a1ea77 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From dd254319bedddd5b007650c5005102af66a4f6a0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:21:25 +0300 Subject: [PATCH 231/295] Update wordpress.stpl --- install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl index 12182544..2d20db29 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From b30f0c65d74a6e2564e01c40b76ce8a333bd6e1e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:21:32 +0300 Subject: [PATCH 232/295] Update wordpress2.stpl --- .../ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl index da5b75e5..310ef7aa 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 20e240bc4644d320a8b62a05c9c8efd08be9e39e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:30:27 +0300 Subject: [PATCH 233/295] Update joomla.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl index 6105b2c3..f91d5576 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 568db3ac56983e20f22c707dce33242e1e1acbbd Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:30:33 +0300 Subject: [PATCH 234/295] Update modx.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl index 54fab2b1..e06eeecb 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 5d347964b4276a301a6f13ad59110bf8914c1667 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:30:40 +0300 Subject: [PATCH 235/295] Update moodle.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl index 7f16b0dd..8276d62a 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 350c1c9cfbf0ac33bacc914abb608e45901d58fe Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:31:41 +0300 Subject: [PATCH 236/295] Update cms_made_simple.stpl --- .../16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl index b19fdeaa..f6bd4533 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 3d8ab2c33711940f280c4d4710fb538d55b0cc45 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:32:00 +0300 Subject: [PATCH 237/295] Update codeigniter2.stpl --- .../ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl index b1491edf..cbf546ec 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 615f4c188c5b48adbaff1095a7387adc908103b5 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:32:19 +0300 Subject: [PATCH 238/295] Update codeigniter3.stpl --- .../ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl index 8723a0e7..7c0f1e79 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 9cc44c7e5311fe157b679078ccf0abb628d56bb9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:32:40 +0300 Subject: [PATCH 239/295] Update datalife_engine.stpl --- .../16.04/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl index 9e7720bf..4daaae51 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From bde6a454d887fd50c77bb7691caadc2685968bd0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:33:06 +0300 Subject: [PATCH 240/295] Update dokuwiki.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl index f0669d6f..aeb404af 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From eb6add8139b80670a9f3432d0383105f3dffd326 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:33:21 +0300 Subject: [PATCH 241/295] Update drupal6.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl index 13c17ecb..e0b5c66d 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f84aef5d08b1a56e8834c6365b7c6bf8892b7e33 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:33:40 +0300 Subject: [PATCH 242/295] Update drupal7.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl index 6e8d89fa..6fe826f7 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 0130a912fa8fc9b96b36c1b748b11c579006e547 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:34:01 +0300 Subject: [PATCH 243/295] Update drupal8.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl index 902f6fdb..e07e3052 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8eb5b2a5c38ef2f06f4a7b8d8f6a6eab279c09a8 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:35:23 +0300 Subject: [PATCH 244/295] Update owncloud.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl index 8cf16b07..f6553e84 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From eb8470f739a3d096e987bec1b252ff02693c433a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:35:37 +0300 Subject: [PATCH 245/295] Update piwik.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl index 877db95a..8543c83f 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 3cb6ef3f0b32ccf7e55d7cce4c453ec5d77f50e5 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:35:51 +0300 Subject: [PATCH 246/295] Update pyrocms.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl index ced7b44b..81fd0f63 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 3ef92adbbd4ce993f7212bf768e2492c09a56741 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:35:58 +0300 Subject: [PATCH 247/295] Update wordpress.stpl --- install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl index a43dbe82..9ad1c23e 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 8a45b4b2660a86c745e22861d155689a6b1c97fe Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:36:11 +0300 Subject: [PATCH 248/295] Update wordpress2.stpl --- .../ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl index 80fd787a..6a7c47c3 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a68dd659ebbedad3cf41597423e17e71909753c6 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:45:44 +0300 Subject: [PATCH 249/295] Update cms_made_simple.stpl --- .../16.10/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.stpl index b19fdeaa..f6bd4533 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c01138d10dc8c1516a5a8d8634045b6a337b642d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:45:50 +0300 Subject: [PATCH 250/295] Update codeigniter2.stpl --- .../ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.stpl index b1491edf..cbf546ec 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f6e176443b91d9f3a31f5bb5874ee02a8b6d8db1 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:45:55 +0300 Subject: [PATCH 251/295] Update codeigniter3.stpl --- .../ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.stpl index 8723a0e7..7c0f1e79 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 506b42d511c02f5678307b7bb109587875e92dbc Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:46:33 +0300 Subject: [PATCH 252/295] Update datalife_engine.stpl --- .../16.10/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.stpl index 9e7720bf..4daaae51 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 6e86dc252f4587474525f516a5f59cf8e06aca8f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:46:37 +0300 Subject: [PATCH 253/295] Update dokuwiki.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.stpl index f0669d6f..aeb404af 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 762965c16e96741a2405b8b7da017a78e877382d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:46:41 +0300 Subject: [PATCH 254/295] Update drupal6.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl index 13c17ecb..e0b5c66d 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 149e41d6f7cbe7db7991ab649e4e9e843aa9c7df Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:48:20 +0300 Subject: [PATCH 255/295] Update drupal7.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl index 6e8d89fa..6fe826f7 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From c0ebc0ccf36cb1c9e0d5454df319dc2b9e3e29f5 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:48:26 +0300 Subject: [PATCH 256/295] Update drupal8.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl index 902f6fdb..e07e3052 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 34ee676a3ace338099a76ac93c7fe0fb870e8d6b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:48:34 +0300 Subject: [PATCH 257/295] Update joomla.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.stpl index 6105b2c3..f91d5576 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/joomla.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 574e54ac09467022b04a6fc1926a35ebaf3b919e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:49:03 +0300 Subject: [PATCH 258/295] Update modx.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.stpl index 54fab2b1..e06eeecb 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/modx.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From f5737ed501c6a2739fd193723474fc33c5c592e3 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:49:25 +0300 Subject: [PATCH 259/295] Update moodle.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.stpl index 7f16b0dd..8276d62a 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/moodle.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From adc57e0d765187de8d7a04a529a55a33386666e4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:49:31 +0300 Subject: [PATCH 260/295] Update owncloud.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.stpl index 8cf16b07..f6553e84 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 0fa8718c75f1d7ebb77ed1cb3bf68d5543d176a4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:49:41 +0300 Subject: [PATCH 261/295] Update piwik.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.stpl index 877db95a..8543c83f 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/piwik.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From a6bd5389fc473f46bc481577122ef7e5b7054b93 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:50:13 +0300 Subject: [PATCH 262/295] Update pyrocms.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl index ced7b44b..81fd0f63 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/public; + root %sdocroot%/public; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 065b9053ba2129ffabf808aab3bd4d3c024f03ec Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:50:26 +0300 Subject: [PATCH 263/295] Update wordpress.stpl --- install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.stpl index a43dbe82..9ad1c23e 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From 0724f4c35be8c4078eac713a37492943519505f2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 15 Sep 2017 18:50:46 +0300 Subject: [PATCH 264/295] Update wordpress2.stpl --- .../ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.stpl index 80fd787a..6a7c47c3 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%; + root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; From d72d85d66f79f2cd6437c5db386b20a1135e6fed Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 20:49:24 +0300 Subject: [PATCH 265/295] Update magento.stpl Fix docroot to sdocroot --- .../debian/7/templates/web/nginx/php5-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl b/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From fabd6f1099d5d28ecb933a61af4e574a3b687408 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 20:52:10 +0300 Subject: [PATCH 266/295] Update magento.stpl Fix docroot to sdocroot --- .../debian/8/templates/web/nginx/php5-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl b/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From 8d6ae9d4a1e2baffcfc0048a32b6d4f3b728968c Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 20:57:04 +0300 Subject: [PATCH 267/295] Update magento.stpl Fix docroot to sdocroot --- install/rhel/5/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From c50adb3f95bcf14a37557c020740462750d7c0ca Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 20:58:06 +0300 Subject: [PATCH 268/295] Update magento.stpl Fix docroot to sdocroot --- install/rhel/6/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From 3d2231ba56fc5e8200a44013ab66abde8065b7dc Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 20:59:01 +0300 Subject: [PATCH 269/295] Update magento.stpl Fix docroot to sdocroot --- install/rhel/7/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl b/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From 133b1a76c5a79094b33c677c9a9a37f94dee4766 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:00:12 +0300 Subject: [PATCH 270/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From 4de5dc0b0b4980867b69d4565cba00684122ad51 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:01:23 +0300 Subject: [PATCH 271/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From 345bdb44da4b1b5931c2ad4c715f849f51b30ce0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:02:23 +0300 Subject: [PATCH 272/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From 36b9d2ba223e55878967f8398f3e7f53ade447b1 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:03:16 +0300 Subject: [PATCH 273/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From da5f720f561fc2b7d22f6af591d12332e8fffd43 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:06:08 +0300 Subject: [PATCH 274/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From 8913424331de036c05138b99782ed53bd42cf57b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:06:58 +0300 Subject: [PATCH 275/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From 19cf2ddaba622fda0dec37fecfd2009fdf4a1c56 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:07:58 +0300 Subject: [PATCH 276/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From ada7769d1bfe408fbd3ec17e6b4d0bd75d473e37 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:08:41 +0300 Subject: [PATCH 277/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From fef5e9c594008ef4719001515b24bd73db247f6c Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:09:20 +0300 Subject: [PATCH 278/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From dd5ba849e40135185c334a674c0889d152604c34 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Sat, 16 Sep 2017 21:10:14 +0300 Subject: [PATCH 279/295] Update magento.stpl Fix docroot to sdocroot --- .../ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl index f067f63d..384ae09f 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/magento.stpl @@ -2,7 +2,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %docroot%/pub; + root %sdocroot%/pub; index index.php; autoindex off; charset UTF-8; @@ -19,7 +19,7 @@ server { # PHP entry point for setup application location ~* ^/setup($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/setup/index.php { fastcgi_pass %backend_lsnr%; @@ -39,7 +39,7 @@ server { # PHP entry point for update application location ~* ^/update($|/) { - root %docroot%; + root %sdocroot%; location ~ ^/update/index.php { fastcgi_split_path_info ^(/update/index.php)(/.+)$; @@ -69,7 +69,7 @@ server { deny all; } - alias %docroot%/pub/; + alias %sdocroot%/pub/; add_header X-Frame-Options "SAMEORIGIN"; } From 2f7c1ffc9052a880306a23233626739b88ceaa7d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 15:39:57 +0300 Subject: [PATCH 280/295] Update caching.stpl Minor fixes for caching.stpl template --- install/debian/8/templates/web/nginx/caching.stpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/debian/8/templates/web/nginx/caching.stpl b/install/debian/8/templates/web/nginx/caching.stpl index 276807f2..d31efbda 100755 --- a/install/debian/8/templates/web/nginx/caching.stpl +++ b/install/debian/8/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} From 5f43f51073bc2e92163d6f305a9fb85b6e3237a2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 15:41:08 +0300 Subject: [PATCH 281/295] Update caching.stpl Minor fixes for caching,stpl template --- install/debian/8/templates/web/nginx/caching.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/8/templates/web/nginx/caching.stpl b/install/debian/8/templates/web/nginx/caching.stpl index d31efbda..aaeb60d5 100755 --- a/install/debian/8/templates/web/nginx/caching.stpl +++ b/install/debian/8/templates/web/nginx/caching.stpl @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From a9213cd98c6de379ec0ed41d49c6a459186e487a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 16:44:13 +0300 Subject: [PATCH 282/295] Update caching.stpl Minor fixes for caching.stpl template --- install/debian/7/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/debian/7/templates/web/nginx/caching.stpl b/install/debian/7/templates/web/nginx/caching.stpl index 276807f2..0652d329 100755 --- a/install/debian/7/templates/web/nginx/caching.stpl +++ b/install/debian/7/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From 35572894d5e553f0655710bbfdadc693278f47a7 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 17:46:49 +0300 Subject: [PATCH 283/295] Update caching.stpl Minor fixes for caching.stpl template --- install/rhel/7/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/rhel/7/templates/web/nginx/caching.stpl b/install/rhel/7/templates/web/nginx/caching.stpl index ae1e6929..f027bbc4 100755 --- a/install/rhel/7/templates/web/nginx/caching.stpl +++ b/install/rhel/7/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache %domain%; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From 417f983ff15ab477223679135d96a0644ca0b381 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 17:50:40 +0300 Subject: [PATCH 284/295] Update caching.stpl Minor fixes for caching.stpl template --- install/rhel/6/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/rhel/6/templates/web/nginx/caching.stpl b/install/rhel/6/templates/web/nginx/caching.stpl index ae1e6929..f027bbc4 100755 --- a/install/rhel/6/templates/web/nginx/caching.stpl +++ b/install/rhel/6/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache %domain%; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From caddcb712a11bf68b0efba984506040ba45ba214 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 17:55:39 +0300 Subject: [PATCH 285/295] Update caching.stpl --- install/rhel/5/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/rhel/5/templates/web/nginx/caching.stpl b/install/rhel/5/templates/web/nginx/caching.stpl index ae1e6929..f027bbc4 100755 --- a/install/rhel/5/templates/web/nginx/caching.stpl +++ b/install/rhel/5/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache %domain%; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From a947dcb2b6a230452bd1b02a6ee90e1e6f3efe13 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 18:14:52 +0300 Subject: [PATCH 286/295] Update caching.stpl Minor fixes for caching.stpl template --- install/ubuntu/12.04/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/caching.stpl b/install/ubuntu/12.04/templates/web/nginx/caching.stpl index 276807f2..0652d329 100755 --- a/install/ubuntu/12.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From a81fce78e928c8b9e11765ec41aefad030d90479 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 18:17:19 +0300 Subject: [PATCH 287/295] Minor fixes for caching.stpl template --- install/ubuntu/12.10/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.stpl b/install/ubuntu/12.10/templates/web/nginx/caching.stpl index 276807f2..0652d329 100755 --- a/install/ubuntu/12.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From a7fd96342e98719acc786acdb5fbdbf3eed3b196 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 18:22:00 +0300 Subject: [PATCH 288/295] Minor fixes for caching.stpl template --- install/ubuntu/13.04/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.stpl b/install/ubuntu/13.04/templates/web/nginx/caching.stpl index 276807f2..0652d329 100755 --- a/install/ubuntu/13.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From 66b75158222ff1ec89a4656474538992af705b02 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 18:26:18 +0300 Subject: [PATCH 289/295] Minor fixes for caching.stpl template --- install/ubuntu/13.10/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.stpl b/install/ubuntu/13.10/templates/web/nginx/caching.stpl index 276807f2..0652d329 100755 --- a/install/ubuntu/13.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From e05074fd8d7b3c5c232d011625d8f154a202778d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 18:27:36 +0300 Subject: [PATCH 290/295] Minor fixes for caching.stpl template --- install/ubuntu/14.04/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.stpl b/install/ubuntu/14.04/templates/web/nginx/caching.stpl index 276807f2..0652d329 100755 --- a/install/ubuntu/14.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From 88c1192d59b05029f32f54b37605607b8872f73e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 18:30:18 +0300 Subject: [PATCH 291/295] Minor fixes for caching.stpl template --- install/ubuntu/14.10/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.stpl b/install/ubuntu/14.10/templates/web/nginx/caching.stpl index 276807f2..0652d329 100755 --- a/install/ubuntu/14.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From 6c1deef717183d93d1cff41b320f9780a0e613ac Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 19:26:28 +0300 Subject: [PATCH 292/295] Minor fixes for caching.stpl template --- install/ubuntu/15.04/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.stpl b/install/ubuntu/15.04/templates/web/nginx/caching.stpl index 276807f2..0652d329 100755 --- a/install/ubuntu/15.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From 1755b20efc03e9a595680ebc6bb6c78cdcfc38af Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 19:27:56 +0300 Subject: [PATCH 293/295] Minor fixes for caching.stpl template --- install/ubuntu/15.10/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.stpl b/install/ubuntu/15.10/templates/web/nginx/caching.stpl index 276807f2..0652d329 100755 --- a/install/ubuntu/15.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; + include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; } From ab57949a54f6fd704e13edae95ef4f993a1c1de9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 20:29:28 +0300 Subject: [PATCH 294/295] Minor fixes for caching.stpl template --- install/ubuntu/16.04/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/caching.stpl b/install/ubuntu/16.04/templates/web/nginx/caching.stpl index ca6cffe3..5e0e4064 100755 --- a/install/ubuntu/16.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain%.conf*; } From 0c7f1305d678c63a1fd07b45e12d36d96f040e60 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Fri, 22 Sep 2017 20:30:37 +0300 Subject: [PATCH 295/295] Minor fixes for caching.stpl template --- install/ubuntu/16.10/templates/web/nginx/caching.stpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/caching.stpl b/install/ubuntu/16.10/templates/web/nginx/caching.stpl index ca6cffe3..5e0e4064 100755 --- a/install/ubuntu/16.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/caching.stpl @@ -7,7 +7,7 @@ server { error_log /var/log/%web_system%/domains/%domain%.error.log error; location / { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; proxy_cache cache; proxy_cache_valid 15m; @@ -18,7 +18,7 @@ server { location ~* ^.+\.(%proxy_extentions%)$ { proxy_cache off; - root %docroot%; + root %sdocroot%; access_log /var/log/%web_system%/domains/%domain%.log combined; access_log /var/log/%web_system%/domains/%domain%.bytes bytes; expires max; @@ -31,7 +31,7 @@ server { } location @fallback { - proxy_pass http://%ip%:%web_port%; + proxy_pass https://%ip%:%web_ssl_port%; } location ~ /\.ht {return 404;} @@ -40,5 +40,5 @@ server { location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - include %home%/%user%/conf/web/nginx.%domain%.conf*; + include %home%/%user%/conf/web/snginx.%domain%.conf*; }