From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
install/tpl/nginx_ispconfig.vhost.master | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/install/tpl/nginx_ispconfig.vhost.master b/install/tpl/nginx_ispconfig.vhost.master
index ab0c6e4..72fbacf 100644
--- a/install/tpl/nginx_ispconfig.vhost.master
+++ b/install/tpl/nginx_ispconfig.vhost.master
@@ -1,11 +1,14 @@
server {
- listen {vhost_port}{ssl_on};
+ listen {vhost_port};
+ ssl {ssl_on};
{ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;
{ssl_comment}ssl_certificate_key /usr/local/ispconfig/interface/ssl/ispserver.key;
server_name _;
root /usr/local/ispconfig/interface/web/;
+
+ client_max_body_size 20M;
location / {
index index.php index.html;
@@ -17,30 +20,59 @@
}
location ~ \.php$ {
- fastcgi_pass 127.0.0.1:{fpm_port};
+ try_files $uri =404;
+ include /etc/nginx/fastcgi_params;
+ fastcgi_pass unix:{fpm_socket};
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_script_name;
- include /etc/nginx/fastcgi_params;
+ fastcgi_buffer_size 128k;
+ fastcgi_buffers 256 4k;
+ fastcgi_busy_buffers_size 256k;
+ fastcgi_temp_file_write_size 256k;
}
location ~ /\. {
deny all;
}
- location /phpmyadmin/ {
- root /usr/share/;
- index index.php index.html index.htm;
- location ~ ^/phpmyadmin/(.+\.php)$ {
- root /usr/share/;
- fastcgi_pass 127.0.0.1:{fpm_port};
- {ssl_comment}fastcgi_param HTTPS {fastcgi_ssl};
- fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME $request_filename;
- include /etc/nginx/fastcgi_params;
- }
- location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
- root /usr/share/;
- }
- }
+# location /phpmyadmin {
+# root /usr/share/;
+# index index.php index.html index.htm;
+# location ~ ^/phpmyadmin/(.+\.php)$ {
+# try_files $uri =404;
+# root /usr/share/;
+# include /etc/nginx/fastcgi_params;
+# fastcgi_pass unix:{fpm_socket};
+# {ssl_comment}fastcgi_param HTTPS {fastcgi_ssl};
+# fastcgi_index index.php;
+# fastcgi_param SCRIPT_FILENAME $request_filename;
+# }
+# location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
+# root /usr/share/;
+# }
+# }
+# location /phpMyAdmin {
+# rewrite ^/* /phpmyadmin last;
+# }
+#
+# location /squirrelmail {
+# root /usr/share/;
+# index index.php index.html index.htm;
+# location ~ ^/squirrelmail/(.+\.php)$ {
+# try_files $uri =404;
+# root /usr/share/;
+# include /etc/nginx/fastcgi_params;
+# fastcgi_pass unix:{fpm_socket};
+# {ssl_comment}fastcgi_param HTTPS {fastcgi_ssl};
+# fastcgi_index index.php;
+# fastcgi_param SCRIPT_FILENAME $request_filename;
+# }
+# location ~* ^/squirrelmail/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
+# root /usr/share/;
+# }
+# }
+# location /webmail {
+# rewrite ^/* /squirrelmail last;
+# }
}
\ No newline at end of file
--
Gitblit v1.9.1