Commit 2a81742e0e63e9f4fa0e578d336e78780271c742

Authored by Alexis Gavoty
Exists in master

Merge pull request #18 from julienmalik/master

do not leak php settings

Showing 5 changed files Side-by-side Diff

... ... @@ -237,3 +237,6 @@ catch_workers_output = yes
237 237 ;php_admin_value[error_log] = /var/log/fpm-php.www.log
238 238 ;php_admin_flag[log_errors] = on
239 239 ;php_admin_value[memory_limit] = 32M
  240 +
  241 +php_value[upload_max_filesize] = 10G
  242 +php_value[post_max_size] = 10G
conf/php-fpm.ini
... ... @@ -1,2 +0,0 @@
1   -upload_max_filesize=10G
2   -post_max_size=10G
... ... @@ -43,7 +43,6 @@ sudo mkdir -p $data_path
43 43 sudo cp -a ../sources/* $final_path
44 44 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/owncloud.conf
45 45 sudo cp ../conf/php-fpm.conf /etc/php5/fpm/pool.d/owncloud.conf
46   -sudo cp ../conf/php-fpm.ini /etc/php5/fpm/conf.d/20-owncloud.ini
47 46 sudo cp ../conf/mount.json $data_path
48 47 sudo chown -hR owncloud:www-data $final_path
49 48 sudo chown -hR owncloud:www-data $data_path
... ... @@ -10,7 +10,6 @@ sudo rm -rf /var/www/owncloud
10 10 sudo rm -rf /home/yunohost.app/owncloud
11 11 sudo rm -f /etc/nginx/conf.d/$domain.d/owncloud.conf
12 12 sudo rm -f /etc/php5/fpm/pool.d/owncloud.conf
13   -sudo rm -f /etc/php5/conf.d/20-owncloud.ini
14 13 for i in $(ls /home)
15 14 do
16 15 if [[ ! $i == yunohost.* ]];
... ... @@ -23,7 +23,6 @@ sudo mkdir -p $data_path
23 23 sudo cp -a ../sources/* $final_path
24 24 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/owncloud.conf
25 25 sudo cp ../conf/php-fpm.conf /etc/php5/fpm/pool.d/owncloud.conf
26   -sudo cp ../conf/php-fpm.ini /etc/php5/fpm/conf.d/20-owncloud.ini
27 26 sudo cp ../conf/mount.json $data_path
28 27 sudo chown -hR owncloud:www-data $final_path
29 28 sudo chown -hR owncloud:www-data $data_path