From ef6644df346ae8c77f1b4090bcbeca890c738a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Thu, 26 Apr 2018 13:57:23 +0200 Subject: [PATCH] [PHP-FPM] Delete old pool files [Nginx] Remove dev code --- data/conf/nginx/site.conf | 13 ------------- data/conf/phpfpm/php-fpm.d/system.conf | 12 ------------ data/conf/phpfpm/php-fpm.d/www.conf | 11 ----------- 3 files changed, 36 deletions(-) delete mode 100644 data/conf/phpfpm/php-fpm.d/system.conf delete mode 100644 data/conf/phpfpm/php-fpm.d/www.conf diff --git a/data/conf/nginx/site.conf b/data/conf/nginx/site.conf index 53a48ad6..e339fdf9 100644 --- a/data/conf/nginx/site.conf +++ b/data/conf/nginx/site.conf @@ -95,19 +95,6 @@ server { expires $expires; } - location /lists/ { - proxy_pass http://mm-web:8000/; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real-IP $remote_addr; - proxy_redirect off; - expires $expires; - } - - location /mm_static { - alias /opt/mm_web-data/static; - } - location ~* ^/Autodiscover/Autodiscover.xml { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass phpfpm:9002; diff --git a/data/conf/phpfpm/php-fpm.d/system.conf b/data/conf/phpfpm/php-fpm.d/system.conf deleted file mode 100644 index 52edd73c..00000000 --- a/data/conf/phpfpm/php-fpm.d/system.conf +++ /dev/null @@ -1,12 +0,0 @@ -[system] -user = www-data -group = www-data -pm = dynamic -pm.max_children = 10 -pm.start_servers = 2 -pm.min_spare_servers = 2 -pm.max_spare_servers = 4 -listen = [::]:9001 -access.log = /proc/self/fd/2 -clear_env = no -catch_workers_output = yes diff --git a/data/conf/phpfpm/php-fpm.d/www.conf b/data/conf/phpfpm/php-fpm.d/www.conf deleted file mode 100644 index e341c3c7..00000000 --- a/data/conf/phpfpm/php-fpm.d/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -user = www-data -group = www-data -pm = ondemand -pm.max_children = 20 -pm.process_idle_timeout = 20s -pm.max_requests = 800 -listen = [::]:9000 -access.log = /proc/self/fd/2 -clear_env = no -catch_workers_output = yes