From a3be7f3e1875f778cfc32da30d514f5107c9c32f Mon Sep 17 00:00:00 2001 From: Bram Prieshof Date: Fri, 17 Jul 2020 15:52:34 +0200 Subject: [PATCH] Added Custom php pools to all available CMS's --- CMS/Backend/conf.sh | 4 +++- CMS/nextcloud/Fpm-Pool.conf-unconfigured | 26 ++++++++++++++++++++++++ CMS/nextcloud/Nginx-unconfigured | 2 +- CMS/nextcloud/conf.sh | 7 +++++++ CMS/nextcloud/nginx-conf.sh | 19 ++++------------- CMS/none/Fpm-Pool.conf-unconfigured | 19 +++++++++++++++++ CMS/none/Nginx-unconfigured | 2 +- CMS/none/conf.sh | 7 +++++++ CMS/none/nginx-conf.sh | 8 +++++--- CMS/wordpress/Fpm-Pool.conf-unconfigured | 20 ++++++++++++++++++ CMS/wordpress/Nginx-unconfigured | 2 +- CMS/wordpress/conf.sh | 10 ++++++++- CMS/wordpress/nginx-conf.sh | 12 ++--------- 13 files changed, 105 insertions(+), 33 deletions(-) create mode 100644 CMS/nextcloud/Fpm-Pool.conf-unconfigured create mode 100644 CMS/nextcloud/conf.sh create mode 100644 CMS/none/Fpm-Pool.conf-unconfigured create mode 100644 CMS/none/conf.sh create mode 100644 CMS/wordpress/Fpm-Pool.conf-unconfigured diff --git a/CMS/Backend/conf.sh b/CMS/Backend/conf.sh index 710df6f..486202e 100644 --- a/CMS/Backend/conf.sh +++ b/CMS/Backend/conf.sh @@ -4,4 +4,6 @@ sed -i 's/PHPver/'$phpver'/' /etc/php/"$phpver"/fpm/pool.d/Backend.conf groupadd Backend useradd -g Backend Backend chown Backend:Backend -R /usr/share/phpmyadmin -chown Backend:Backend -R /var/lib/phpmyadmin/tmp \ No newline at end of file +chown Backend:Backend -R /var/lib/phpmyadmin/tmp + +systemctl reload php"$phpver"-fpm \ No newline at end of file diff --git a/CMS/nextcloud/Fpm-Pool.conf-unconfigured b/CMS/nextcloud/Fpm-Pool.conf-unconfigured new file mode 100644 index 0000000..32add02 --- /dev/null +++ b/CMS/nextcloud/Fpm-Pool.conf-unconfigured @@ -0,0 +1,26 @@ +[SITEname] +user = SITEname +group = SITEname +listen = /var/run/php/phpPHPver-fpm-SITEname.sock +listen.owner = www-data +listen.group = www-data +php_admin_value[disable_functions] = exec,passthru,shell_exec,system +php_admin_value[error_log] = /var/log/php-fpm/error-SITEname.log +php_admin_value[post_max_size] = 1G +php_admin_value[upload_max_filesize] = 1G +php_admin_value[memory_limit] = 512M +php_admin_value[apc.enable_cli] = 1 +php_admin_value[cgi.fix_pathinfo] = 0 +php_admin_value[max_input_vars] = 10000 +php_admin_flag[allow_url_fopen] = off +pm = dynamic +pm.max_children = 120 +pm.start_servers = 12 +pm.min_spare_servers = 6 +pm.max_spare_servers = 18 +chdir = / +env[HOSTNAME] = $HOSTNAME +env[PATH] = /usr/local/bin:/usr/bin:/bin +env[TMP] = /tmp +env[TMPDIR] = /tmp +env[TEMP] = /tmp \ No newline at end of file diff --git a/CMS/nextcloud/Nginx-unconfigured b/CMS/nextcloud/Nginx-unconfigured index 98a8de9..04e5659 100644 --- a/CMS/nextcloud/Nginx-unconfigured +++ b/CMS/nextcloud/Nginx-unconfigured @@ -55,7 +55,7 @@ location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|u fastcgi_param HTTPS on; fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; - fastcgi_pass unix:/var/run/php/phpPHPver-fpm.sock; + fastcgi_pass unix:/var/run/php/phpPHPver-fpm-SITEname.sock; fastcgi_intercept_errors on; fastcgi_request_buffering off; } diff --git a/CMS/nextcloud/conf.sh b/CMS/nextcloud/conf.sh new file mode 100644 index 0000000..83c3c69 --- /dev/null +++ b/CMS/nextcloud/conf.sh @@ -0,0 +1,7 @@ +#PHP Pool +wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/Fpm-Pool.conf-unconfigured -O /etc/php/"$phpver"/fpm/pool.d/"$sitename".conf +sed -i -e 's/PHPver/'$phpver'/' -e 's/SITEname/'$sitename'/' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf +groupadd "$sitename" +useradd -g "$sitename" "$sitename" + +systemctl reload php"$phpver"-fpm \ No newline at end of file diff --git a/CMS/nextcloud/nginx-conf.sh b/CMS/nextcloud/nginx-conf.sh index 6ba6593..3b36fcf 100644 --- a/CMS/nextcloud/nginx-conf.sh +++ b/CMS/nextcloud/nginx-conf.sh @@ -2,23 +2,14 @@ #Configuring nginx wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/Nginx-unconfigured -O /tmp/nginx-siteconf -sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' /tmp/nginx-siteconf -sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-enabled/"$domain" +sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/nginx-siteconf +sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/"$domain" if [ $sslenable = 0 ]; then -sed -i -e '/fastcgi_param HTTPS/c\# fastcgi_param HTTPS' /etc/nginx/sites-enabled/"$domain" +sed -i -e '/fastcgi_param HTTPS/c\# fastcgi_param HTTPS' /etc/nginx/sites-available/"$domain" fi mkdir -p /var/www/"$domain"/html -#Configuring PHP -if [ -z ${ignphpcms+x} ]; then ignphpcms=0;fi - if [ $ignphpcms != 1 ]; then - sed -i '/upload_max_filesize/c\upload_max_filesize = 1G' /etc/php/"$phpver"/fpm/php.ini - sed -i '/post_max_size/c\post_max_size = 1G' /etc/php/"$phpver"/fpm/php.ini - sed -i '/memory_limit/c\memory_limit = 512M' /etc/php/"$phpver"/fpm/php.ini - echo "apc.enable_cli = 1" >> /etc/php/"$phpver"/fpm/php.ini -fi - #Getting Nextcloud wget -t7 http://mirror.nxdi.nl/resources/nextcloud/latest.tar.bz2 -O /tmp/nextcloud.tar.bz2 tar jxf /tmp/nextcloud.tar.bz2 -C /tmp @@ -49,9 +40,7 @@ cat < /var/www/$domain/html/config/autoconfig.php ); EOF -chown www-data:www-data -R /var/www/"$domain"/html -systemctl reload nginx php$phpver-fpm - +chown "$sitename":"$sitename" -R /var/www/"$domain"/html #Makeing nextcloud Finalize script and setting login Notice wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/nextcloud/nextcloud-init.sh -O ~/nextcloud-init.sh diff --git a/CMS/none/Fpm-Pool.conf-unconfigured b/CMS/none/Fpm-Pool.conf-unconfigured new file mode 100644 index 0000000..83c9466 --- /dev/null +++ b/CMS/none/Fpm-Pool.conf-unconfigured @@ -0,0 +1,19 @@ +[SITEname] +user = SITEname +group = SITEname +listen = /var/run/php/phpPHPver-fpm-SITEname.sock +listen.owner = www-data +listen.group = www-data +php_admin_value[disable_functions] = exec,passthru,shell_exec,system +php_admin_value[error_log] = /var/log/php-fpm/error-SITEname.log +php_admin_value[cgi.fix_pathinfo] = 0 +php_admin_value[max_input_vars] = 10000 +php_admin_value[upload_max_filesize] = 128M +php_admin_value[post_max_size] = 64m +php_admin_flag[allow_url_fopen] = off +pm = dynamic +pm.max_children = 5 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 +chdir = / diff --git a/CMS/none/Nginx-unconfigured b/CMS/none/Nginx-unconfigured index 37a82c4..cb1d177 100644 --- a/CMS/none/Nginx-unconfigured +++ b/CMS/none/Nginx-unconfigured @@ -16,7 +16,7 @@ location ~ \.php$ { include snippets/fastcgi-php.conf; - fastcgi_pass unix:/var/run/php/phpPHPver-fpm.sock; + fastcgi_pass unix:/var/run/php/phpPHPver-fpm-SITEname.sock; } location ~ /\.ht { diff --git a/CMS/none/conf.sh b/CMS/none/conf.sh new file mode 100644 index 0000000..ee108b9 --- /dev/null +++ b/CMS/none/conf.sh @@ -0,0 +1,7 @@ +#Backend PHP Pool +wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/none/Fpm-Pool.conf-unconfigured -O /etc/php/"$phpver"/fpm/pool.d/"$sitename".conf +sed -i -e 's/PHPver/'$phpver'/' -e 's/SITEname/'$sitename'/' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf +groupadd "$sitename" +useradd -g "$sitename" "$sitename" + +systemctl reload php"$phpver"-fpm \ No newline at end of file diff --git a/CMS/none/nginx-conf.sh b/CMS/none/nginx-conf.sh index d3c1fc1..a56e8de 100644 --- a/CMS/none/nginx-conf.sh +++ b/CMS/none/nginx-conf.sh @@ -1,7 +1,9 @@ wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/none/Nginx-unconfigured -O /tmp/nginx-siteconf -sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' /tmp/nginx-siteconf -sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-enabled/"$domain" +sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/nginx-siteconf +sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/"$domain" mkdir -p /var/www/"$domain"/html -chown www-data:www-data -R /var/www/"$domain"/html + echo "$webserv has been succsefully installed by the Wizard" > /var/www/$domain/html/index.html + +chown "$sitename":"$sitename" -R /var/www/"$domain"/html systemctl reload nginx \ No newline at end of file diff --git a/CMS/wordpress/Fpm-Pool.conf-unconfigured b/CMS/wordpress/Fpm-Pool.conf-unconfigured new file mode 100644 index 0000000..cf00331 --- /dev/null +++ b/CMS/wordpress/Fpm-Pool.conf-unconfigured @@ -0,0 +1,20 @@ +[SITEname] +user = SITEname +group = SITEname +listen = /var/run/php/phpPHPver-fpm-SITEname.sock +listen.owner = www-data +listen.group = www-data +php_admin_value[error_log] = /var/log/php-fpm/error-SITEname.log +php_admin_value[cgi.fix_pathinfo] = 0 +php_admin_value[post_max_size] = 512M +php_admin_value[upload_max_filesize] = 1G +php_admin_value[memory_limit] = 512M +php_admin_value[max_input_vars] = 10000 +php_admin_value[disable_functions] = exec,passthru,shell_exec,system +php_admin_flag[allow_url_fopen] = off +pm = dynamic +pm.max_children = 5 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 +chdir = / diff --git a/CMS/wordpress/Nginx-unconfigured b/CMS/wordpress/Nginx-unconfigured index 569291b..7b56f59 100644 --- a/CMS/wordpress/Nginx-unconfigured +++ b/CMS/wordpress/Nginx-unconfigured @@ -24,7 +24,7 @@ location ~* \.(css|gif|ico|jpeg|jpg|js|png|svg|webp|eot|otf|woff|woff2|ttf|ogg)$ location ~ \.php$ { include snippets/fastcgi-php.conf; - fastcgi_pass unix:/var/run/php/phpPHPver-fpm.sock; + fastcgi_pass unix:/var/run/php/phpPHPver-fpm-SITEname.sock; } location ~ /\.ht { diff --git a/CMS/wordpress/conf.sh b/CMS/wordpress/conf.sh index be95448..2f5a967 100644 --- a/CMS/wordpress/conf.sh +++ b/CMS/wordpress/conf.sh @@ -24,5 +24,13 @@ wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/WordPress-unconfigured -O sed -i -e 's/DBPass/'$db_pass'/' -e 's/DBUser/'$db_user'/' -e 's/DBName/'$db_name'/' -e 's/DOMAINname/'$domain'/' /var/www/"$domain"/html/wp-config.php printf '%s\n' "g/WPsalty/d" a "$WPSalts" . w | ed -s /var/www/"$domain"/html/wp-config.php +#PHP Pool +wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/Fpm-Pool.conf-unconfigured -O /etc/php/"$phpver"/fpm/pool.d/"$sitename".conf +sed -i -e 's/PHPver/'$phpver'/' -e 's/SITEname/'$sitename'/' /etc/php/"$phpver"/fpm/pool.d/$sitename.conf +groupadd "$sitename" +useradd -g "$sitename" "$sitename" + +systemctl reload php"$phpver"-fpm + #Setting Permsissions -chown www-data:www-data -R /var/www/"$domain"/html +chown "$sitename":"$sitename" -R /var/www/"$domain"/html diff --git a/CMS/wordpress/nginx-conf.sh b/CMS/wordpress/nginx-conf.sh index 119c811..3a6b43d 100644 --- a/CMS/wordpress/nginx-conf.sh +++ b/CMS/wordpress/nginx-conf.sh @@ -1,15 +1,7 @@ -#Configuring PHP -if [ -z ${ignphpcms+x} ]; then ignphpcms=0;fi - if [ $ignphpcms != 1 ]; then - sed -i '/upload_max_filesize/c\upload_max_filesize = 1G' /etc/php/"$phpver"/fpm/php.ini - sed -i '/post_max_size/c\post_max_size = 512M' /etc/php/"$phpver"/fpm/php.ini - sed -i '/memory_limit/c\memory_limit = 512M' /etc/php/"$phpver"/fpm/php.ini -fi - #Configuring nginx wget -q -t7 "$repo"/raw/branch/"$branch"/CMS/wordpress/Nginx-unconfigured -O /tmp/nginx-siteconf -sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' /tmp/nginx-siteconf -sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-enabled/"$domain" +sed -i -e 's/PHPver/'$phpver'/g' -e 's/DOMAINname/'$domain'/' -e 's/SITEname/'$sitename'/' /tmp/nginx-siteconf +sed -i -e "0,/^#ConfHere/s/\(^#Conf.*\)/#ConfHere1 /" -e '/#ConfHere1/ r /tmp/nginx-siteconf' -e '/#ConfHere/c\' /etc/nginx/sites-available/"$domain" #Reloading Services systemctl reload nginx php$phpver-fpm \ No newline at end of file