Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
f495828a2d
3 mainītis faili ar 20 papildinājumiem un 20 dzēšanām
  1. 3
    3
      src/freedombone-app-nextcloud
  2. 4
    4
      src/freedombone-logging
  3. 13
    13
      src/freedombone-utils-web

+ 3
- 3
src/freedombone-app-nextcloud Parādīt failu

@@ -339,7 +339,7 @@ function remove_nextcloud {
339 339
     function_check remove_nodejs
340 340
     remove_nodejs pleroma-nextcloud
341 341
 
342
-    sed -i 's|env[PATH]|;env[PATH]|g' /etc/php7.0/fpm/pool.d/www.conf
342
+    sed -i 's|env[PATH]|;env[PATH]|g' /etc/php/7.0/fpm/pool.d/www.conf
343 343
 
344 344
     read_config_param "NEXTCLOUD_DOMAIN_NAME"
345 345
     read_config_param "MY_USERNAME"
@@ -393,11 +393,11 @@ function install_nextcloud_main {
393 393
     apt-get -yq install php-memcached php-intl memcached php-memcached
394 394
 
395 395
     # Ensure PATH is available to php
396
-    if [ ! -f /etc/php7.0/fpm/pool.d/www.conf ]; then
396
+    if [ ! -f /etc/php/7.0/fpm/pool.d/www.conf ]; then
397 397
        echo $'No php www configuration file found'
398 398
        exit 628757
399 399
     fi
400
-    sed -i 's|;env[PATH]|env[PATH]|g' /etc/php7.0/fpm/pool.d/www.conf
400
+    sed -i 's|;env[PATH]|env[PATH]|g' /etc/php/7.0/fpm/pool.d/www.conf
401 401
 
402 402
     if [ ! -d /var/www/$NEXTCLOUD_DOMAIN_NAME ]; then
403 403
         mkdir /var/www/$NEXTCLOUD_DOMAIN_NAME

+ 4
- 4
src/freedombone-logging Parādīt failu

@@ -99,8 +99,8 @@ if [[ "$1" == "on" || "$1" == "On" || "$1" == "ON" ]]; then
99 99
     if [ -f /etc/mumble-server.ini ]; then
100 100
         sed -i 's|logfile=.*|logfile=/var/log/mumble-server.log|g' /etc/mumble-server.ini
101 101
     fi
102
-    if [ -f /etc/php7.0/fpm/php-fpm.conf ]; then
103
-        sed -i 's|error_log =.*|error_log = /var/log/php-fpm.log|g' /etc/php7.0/fpm/php-fpm.conf
102
+    if [ -f /etc/php/7.0/fpm/php-fpm.conf ]; then
103
+        sed -i 's|error_log =.*|error_log = /var/log/php-fpm.log|g' /etc/php/7.0/fpm/php-fpm.conf
104 104
     fi
105 105
     if [ -d /etc/nginx ]; then
106 106
         if [ ! -d /var/log/nginx ]; then
@@ -180,8 +180,8 @@ else
180 180
         shred -zu /var/log/radicale/*
181 181
         rm -rf /var/log/radicale
182 182
     fi
183
-    if [ -f /etc/php7.0/fpm/php-fpm.conf ]; then
184
-        sed -i 's|error_log =.*|error_log = /dev/null|g' /etc/php7.0/fpm/php-fpm.conf
183
+    if [ -f /etc/php/7.0/fpm/php-fpm.conf ]; then
184
+        sed -i 's|error_log =.*|error_log = /dev/null|g' /etc/php/7.0/fpm/php-fpm.conf
185 185
         shred -zu /var/log/php-fpm.*
186 186
     fi
187 187
     if [ -d /etc/nginx ]; then

+ 13
- 13
src/freedombone-utils-web Parādīt failu

@@ -401,11 +401,11 @@ function letsencrypt_renewals {
401 401
 }
402 402
 
403 403
 function configure_php {
404
-    sed -i "s/memory_limit = 128M/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php7.0/fpm/php.ini
405
-    sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php7.0/fpm/php.ini
404
+    sed -i "s/memory_limit = 128M/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php/7.0/fpm/php.ini
405
+    sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php/7.0/fpm/php.ini
406 406
     sed -i "s/memory_limit = -1/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php7.0/cli/php.ini
407
-    sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 50M/g" /etc/php7.0/fpm/php.ini
408
-    sed -i "s/post_max_size = 8M/post_max_size = 50M/g" /etc/php7.0/fpm/php.ini
407
+    sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 50M/g" /etc/php/7.0/fpm/php.ini
408
+    sed -i "s/post_max_size = 8M/post_max_size = 50M/g" /etc/php/7.0/fpm/php.ini
409 409
 }
410 410
 
411 411
 function install_web_server_access_control {
@@ -559,15 +559,15 @@ function install_web_server {
559 559
     sed -i 's|error_log.*|error_log = /dev/null;|g' /etc/nginx/nginx.conf
560 560
 
561 561
     # limit the number of php processes
562
-    sed -i 's/; process.max =.*/process.max = 32/g' /etc/php7.0/fpm/php-fpm.conf
563
-    #sed -i 's/;process_control_timeout =.*/process_control_timeout = 300/g' /etc/php7.0/fpm/php-fpm.conf
564
-
565
-    if ! grep -q "pm.max_children" /etc/php7.0/fpm/php-fpm.conf; then
566
-        echo 'pm.max_children = 10' >> /etc/php7.0/fpm/php-fpm.conf
567
-        echo 'pm.start_servers = 2' >> /etc/php7.0/fpm/php-fpm.conf
568
-        echo 'pm.min_spare_servers = 2' >> /etc/php7.0/fpm/php-fpm.conf
569
-        echo 'pm.max_spare_servers = 5' >> /etc/php7.0/fpm/php-fpm.conf
570
-        echo 'pm.max_requests = 50' >> /etc/php7.0/fpm/php-fpm.conf
562
+    sed -i 's/; process.max =.*/process.max = 32/g' /etc/php/7.0/fpm/php-fpm.conf
563
+    #sed -i 's/;process_control_timeout =.*/process_control_timeout = 300/g' /etc/php/7.0/fpm/php-fpm.conf
564
+
565
+    if ! grep -q "pm.max_children" /etc/php/7.0/fpm/php-fpm.conf; then
566
+        echo 'pm.max_children = 10' >> /etc/php/7.0/fpm/php-fpm.conf
567
+        echo 'pm.start_servers = 2' >> /etc/php/7.0/fpm/php-fpm.conf
568
+        echo 'pm.min_spare_servers = 2' >> /etc/php/7.0/fpm/php-fpm.conf
569
+        echo 'pm.max_spare_servers = 5' >> /etc/php/7.0/fpm/php-fpm.conf
570
+        echo 'pm.max_requests = 50' >> /etc/php/7.0/fpm/php-fpm.conf
571 571
     fi
572 572
 
573 573
     if [ ! -d /etc/nginx ]; then