Modifications : etc/nginx/site.d/lhc-www/

diff --git a/etc/nginx/site.d/lhc-www/local.sh b/etc/nginx/site.d/lhc-www/local.sh
index 0d0e85e..56b76bb 100644 (file)
--- a/etc/nginx/site.d/lhc-www/local.sh
+++ b/etc/nginx/site.d/lhc-www/local.sh
@@ -1,3 +1,5 @@
 pool=lhc_www
 sudo adduser php_"$pool" www-"$site"
 sudo adduser www-"$site"-tls www-"$site"
+"$tool"/local/mysql-user-create     php_"$pool"
+"$tool"/local/mysql-database-create php_"$pool"

diff --git a/etc/nginx/site.d/lhc-www/site.conf b/etc/nginx/site.d/lhc-www/site.conf
index 7ed7d17..cac567d 100644 (file)
--- a/etc/nginx/site.d/lhc-www/site.conf
+++ b/etc/nginx/site.d/lhc-www/site.conf
@@ -1,50 +1,22 @@
-server_name www.heureux-cyclage.org heureux-cyclage.org;
+server_name
+    www.heureux-cyclage.org
+    heureux-cyclage.org
+    devel.heureux-cyclage.org;
+root /home/www/data/lhc-www/www;
+index index.php;
 
 client_body_buffer_size 8k;
 client_max_body_size 10m;
-location / {
-       index index.html index.htm index.php;
- }
-location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
-       access_log off;
-       expires 30d;
-       log_not_found off;
- }
-location ~ /\. {
-       access_log off;
-       deny all;
-       log_not_found off;
- }
+
+location ~^/(tmp|config)/{
+       return 403;
+}
 location ~ \.php$ {
        include /etc/nginx/conf.d/fastcgi.conf;
-       set $no_cache "0";
-       if ($request_method !~ ^(GET|HEAD)$) {
-        # NOTE: if non GET/HEAD, don't cache and mark user as uncacheable for 1 second via cookie.
-               set $no_cache "1";
-        }
-       if ($no_cache = "1") {
-        # NOTE: drop no cache cookie if need be (for some reason, add_header fails if included in prior if-block).
-               add_header Set-Cookie "_mcnc=1; Max-Age=2; Path=/";
-               add_header X-Microcachable "0";
-        }
-       if ($http_cookie ~* "_mcnc") {
-        # NOTE: bypass cache if no-cache cookie is set
-               set $no_cache "1";
-        }
-       fastcgi_cache_bypass $no_cache;
-       fastcgi_cache_use_stale updating;
-       fastcgi_cache_valid 200 10s;
-       fastcgi_cache_valid 404 10m;
-       fastcgi_ignore_headers Cache-Control Expires Set-Cookie;
-       fastcgi_index index.php;
-       fastcgi_no_cache $no_cache;
+       fastcgi_index  index.php ;
        fastcgi_param REDIRECT_STATUS 200;
-               # NOTE: PHP only, required if PHP was built with --enable-force-cgi-redirect
-       fastcgi_pass_header Cookie;
-       fastcgi_pass_header Set-Cookie;
        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-       
-       fastcgi_pass unix:/run/php5/fpm/lhc_www;
- }
 
+       fastcgi_pass unix:/run/php5/fpm/lhc_www;
+}
 # vim: ft=sh

diff --git a/etc/php5/fpm/pool.d/lhc_www/php-fpm.conf b/etc/php5/fpm/pool.d/lhc_www/php-fpm.conf
index 9506577..04813ff 100644 (file)
--- a/etc/php5/fpm/pool.d/lhc_www/php-fpm.conf
+++ b/etc/php5/fpm/pool.d/lhc_www/php-fpm.conf
@@ -1,9 +1,11 @@
-pm.max_children = 15
-pm.max_requests = 200
-pm.max_spare_servers = 5
-pm.min_spare_servers = 1
+#php_admin_value[extension] = pdo_mysql.so
+php_admin_value[extension] = mysql.so
+pm.max_children = 4
+pm.max_requests = 1
+pm.max_spare_servers = 4
+pm.min_spare_servers = 2
 pm.process_idle_timeout = 60s
-pm.start_servers = 1
+pm.start_servers = 2
 request_slowlog_timeout = 5s
 request_terminate_timeout = 120s
 rlimit_core = unlimited