Skip to content
This repository was archived by the owner on Feb 20, 2019. It is now read-only.

document that in case of php-fpm configurations, .user.ini must be used instead of .htaccess #856

Merged
mmattel merged 1 commit into from
Feb 19, 2015
Merged

document that in case of php-fpm configurations, .user.ini must be used instead of .htaccess #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions admin_manual/configuration/big_file_upload_configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ System Configuration
Configuring Your Webserver
--------------------------

ownCloud comes with its own ``owncloud/.htaccess`` file. Set the following
two parameters inside this ``.htaccess`` file::
| ownCloud comes with its own ``owncloud/.htaccess`` file.
| If PHP-FPM is used, it can't read ``.htaccess`` PHP settings unless a PECL extension is installed. If PHP-FPM is used without the PECL extension installed, settings and permissions must be set in the ``owncloud/.user.ini`` file.
Copy link
Contributor

@MorrisJobke MorrisJobke Feb 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also add hard line breaks here

Copy link
Contributor Author

@mmattel mmattel Feb 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I understood, and please correct me if I am wrong, the line break is automatically done.

The reason why I used a hard linebreak at the scentence staring with "If PHP-FPM..." was, that readers have a better visibility to distinguish between standard and php-fpm. But I can remove that linebreak so all will be continious.
Or do you have any other place where you point to, and the what shall I do, because the text is in continious writing and linebreaks are made by the system.

Copy link
Contributor

@MorrisJobke MorrisJobke Feb 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These linebreaks in the RST source are made because it shortens the lines and make diffs easier to read on github. Because long lines aren't wrapped here. It's just a convention for this documentation.


Set the following two parameters inside the corresponding .ini file::

php_value upload_max_filesize = 16G
php_value post_max_size = 16G
Expand All @@ -41,7 +43,7 @@ increase the timeout values, which are in seconds::
Configuring PHP
---------------

If you don't want to use the ownCloud ``.htaccess`` file, you may
If you don't want to use the ownCloud ``.htaccess`` or ``.user.ini`` file, you may
configure PHP instead. Make sure to comment out any lines ``.htaccess``
pertaining to upload size, if you entered any.

Expand All @@ -67,7 +69,7 @@ Tell PHP which temp file you want it to use::

upload_tmp_dir = /var/big_temp_file/

**Output Buffering** must be turned off in ``.htaccess`` or ``php.ini``, or PHP
**Output Buffering** must be turned off in ``.htaccess`` or ``.user.ini`` or ``php.ini``, or PHP
will return memory-related errors:

* ``output_buffering = 0``
2 changes: 2 additions & 0 deletions admin_manual/installation/nginx_configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,5 @@ Nginx Configuration
/etc/php5/fpm/php.ini**) and increase **upload_max_filesize** and
**post_max_size** values. You’ll need to restart php5-fpm and nginx
services in order these changes to be applied.

.. note:: ownCloud comes with its own ``owncloud/.htaccess`` file. If PHP-FPM is used, it can't read ``.htaccess`` PHP settings unless a PECL extension is installed. If PHP-FPM is used without the PECL extension installed, settings and permissions must be set in the ``owncloud/.user.ini`` file.
2 changes: 1 addition & 1 deletion admin_manual/installation/source_installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ Example config for Apache 2.4:
* In order for the maximum upload size to be configurable, the
:file:`.htaccess` in the ownCloud folder needs to be made writable by the
server (this should already be done, see section ``Set the Directory
Permissions``).
Permissions``). If PHP-FPM is used, it can't read ``.htaccess`` PHP settings unless a PECL extension is installed. If PHP-FPM is used without the PECL extension installed, settings and permissions must be set in the ``owncloud/.user.ini`` file.
Copy link
Contributor

@MorrisJobke MorrisJobke Feb 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add hard line breaks at ~80 characters


* You should make sure that any built-in WebDAV module of your web server is
disabled (at least for the ownCloud directory), as it will interfere with
Expand Down