Browse Source

php directory

Bob Mottram 8 years ago
parent
commit
f495828a2d
3 changed files with 20 additions and 20 deletions
  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 View File

339
     function_check remove_nodejs
339
     function_check remove_nodejs
340
     remove_nodejs pleroma-nextcloud
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
     read_config_param "NEXTCLOUD_DOMAIN_NAME"
344
     read_config_param "NEXTCLOUD_DOMAIN_NAME"
345
     read_config_param "MY_USERNAME"
345
     read_config_param "MY_USERNAME"
393
     apt-get -yq install php-memcached php-intl memcached php-memcached
393
     apt-get -yq install php-memcached php-intl memcached php-memcached
394
 
394
 
395
     # Ensure PATH is available to php
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
        echo $'No php www configuration file found'
397
        echo $'No php www configuration file found'
398
        exit 628757
398
        exit 628757
399
     fi
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
     if [ ! -d /var/www/$NEXTCLOUD_DOMAIN_NAME ]; then
402
     if [ ! -d /var/www/$NEXTCLOUD_DOMAIN_NAME ]; then
403
         mkdir /var/www/$NEXTCLOUD_DOMAIN_NAME
403
         mkdir /var/www/$NEXTCLOUD_DOMAIN_NAME

+ 4
- 4
src/freedombone-logging View File

99
     if [ -f /etc/mumble-server.ini ]; then
99
     if [ -f /etc/mumble-server.ini ]; then
100
         sed -i 's|logfile=.*|logfile=/var/log/mumble-server.log|g' /etc/mumble-server.ini
100
         sed -i 's|logfile=.*|logfile=/var/log/mumble-server.log|g' /etc/mumble-server.ini
101
     fi
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
     fi
104
     fi
105
     if [ -d /etc/nginx ]; then
105
     if [ -d /etc/nginx ]; then
106
         if [ ! -d /var/log/nginx ]; then
106
         if [ ! -d /var/log/nginx ]; then
180
         shred -zu /var/log/radicale/*
180
         shred -zu /var/log/radicale/*
181
         rm -rf /var/log/radicale
181
         rm -rf /var/log/radicale
182
     fi
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
         shred -zu /var/log/php-fpm.*
185
         shred -zu /var/log/php-fpm.*
186
     fi
186
     fi
187
     if [ -d /etc/nginx ]; then
187
     if [ -d /etc/nginx ]; then

+ 13
- 13
src/freedombone-utils-web View File

401
 }
401
 }
402
 
402
 
403
 function configure_php {
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
     sed -i "s/memory_limit = -1/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php7.0/cli/php.ini
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
 function install_web_server_access_control {
411
 function install_web_server_access_control {
559
     sed -i 's|error_log.*|error_log = /dev/null;|g' /etc/nginx/nginx.conf
559
     sed -i 's|error_log.*|error_log = /dev/null;|g' /etc/nginx/nginx.conf
560
 
560
 
561
     # limit the number of php processes
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
     fi
571
     fi
572
 
572
 
573
     if [ ! -d /etc/nginx ]; then
573
     if [ ! -d /etc/nginx ]; then