| install/dist/lib/fedora.lib.php | ●●●●● patch | view | raw | blame | history | |
| install/dist/lib/gentoo.lib.php | ●●●●● patch | view | raw | blame | history | |
| install/lib/installer_base.lib.php | ●●●●● patch | view | raw | blame | history | |
| install/tpl/apps_php_fpm_pool.conf.master | ●●●●● patch | view | raw | blame | history | |
| install/tpl/nginx_apps.vhost.master | ●●●●● patch | view | raw | blame | history | |
| install/tpl/nginx_ispconfig.vhost.master | ●●●●● patch | view | raw | blame | history | |
| server/conf/nginx_apps.vhost.master | ●●●●● patch | view | raw | blame | history |
install/dist/lib/fedora.lib.php
@@ -861,8 +861,8 @@ if($conf['nginx']['installed'] == true){ $command = 'usermod -a -G ispconfig '.$conf['nginx']['user']; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); // Allow the ISPConfig vhost access to /etc/squirrelmail $command = 'usermod -a -G '.$conf['apache']['group'].' ispconfig'; // Allow the ispapps vhost access to /etc/squirrelmail $command = 'usermod -a -G '.$conf['apache']['group'].' ispapps'; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); }
@@ -653,7 +653,7 @@ // PHP-FPM // Dont just copy over the php-fpm pool template but add some custom settings $content = rf('tpl/php_fpm_pool.conf.master'); $content = rf('tpl/apps_php_fpm_pool.conf.master'); $content = str_replace('{fpm_pool}', 'apps', $content); $content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content); $content = str_replace('{fpm_user}', $apps_vhost_user, $content); install/lib/installer_base.lib.php
@@ -1483,7 +1483,7 @@ // PHP-FPM // Dont just copy over the php-fpm pool template but add some custom settings $content = rf('tpl/php_fpm_pool.conf.master'); $content = rf('tpl/apps_php_fpm_pool.conf.master'); $content = str_replace('{fpm_pool}', 'apps', $content); $content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content); $content = str_replace('{fpm_user}', $apps_vhost_user, $content); install/tpl/apps_php_fpm_pool.conf.master
New file @@ -0,0 +1,18 @@ [{fpm_pool}] listen = 127.0.0.1:{fpm_port} listen.allowed_clients = 127.0.0.1 user = {fpm_user} group = {fpm_group} pm = dynamic pm.max_children = 50 pm.start_servers = 20 pm.min_spare_servers = 5 pm.max_spare_servers = 35 chdir = / php_admin_flag[magic_quotes_gpc] = off install/tpl/nginx_apps.vhost.master
@@ -30,4 +30,42 @@ location ~ /\. { deny all; } 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 127.0.0.1:{fpm_port}; 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 127.0.0.1:{fpm_port}; 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; } } install/tpl/nginx_ispconfig.vhost.master
@@ -33,43 +33,43 @@ deny all; } 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 127.0.0.1:{fpm_port}; {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 127.0.0.1:{fpm_port}; {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; } # 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 127.0.0.1:{fpm_port}; # {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 127.0.0.1:{fpm_port}; # {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; # } } server/conf/nginx_apps.vhost.master
@@ -30,4 +30,42 @@ location ~ /\. { deny all; } 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 127.0.0.1:{fpm_port}; 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 127.0.0.1:{fpm_port}; 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; } }
