diff options
Diffstat (limited to 'config/config.sample.php')
| -rw-r--r-- | config/config.sample.php | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index f7861c3c94c..806345092f2 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -463,14 +463,17 @@ $CONFIG = [ 'mail_smtptimeout' => 10, /** - * This depends on ``mail_smtpmode``. Specify when you are using ``ssl`` for SSL/TLS or - * ``tls`` for STARTTLS, or leave empty for no encryption. + * This depends on ``mail_smtpmode``. Specify ``ssl`` when you are using SSL/TLS. Any other value will be ignored. + * + * If the server advertises STARTTLS capabilities, they might be used, but they cannot be enforced by + * this config option. * * Defaults to ``''`` (empty string) */ 'mail_smtpsecure' => '', /** + * * This depends on ``mail_smtpmode``. Change this to ``true`` if your mail * server requires authentication. * @@ -479,14 +482,6 @@ $CONFIG = [ 'mail_smtpauth' => false, /** - * This depends on ``mail_smtpmode``. If SMTP authentication is required, choose - * the authentication type as ``LOGIN`` or ``PLAIN``. - * - * Defaults to ``LOGIN`` - */ -'mail_smtpauthtype' => 'LOGIN', - -/** * This depends on ``mail_smtpauth``. Specify the username for authenticating to * the SMTP server. * @@ -1190,14 +1185,14 @@ $CONFIG = [ 'preview_office_cl_parameters' => ' --headless --nologo --nofirststartwizard --invisible --norestore '. '--convert-to png --outdir ', - + /** * custom path for ffmpeg binary - * + * * Defaults to ``null`` and falls back to searching ``avconv`` and ``ffmpeg`` in the configured ``PATH`` environment */ -'preview_ffmpeg_path' => '/usr/bin/ffmpeg', - +'preview_ffmpeg_path' => '/usr/bin/ffmpeg', + /** * Set the URL of the Imaginary service to send image previews to. * Also requires the ``OC\Preview\Imaginary`` provider to be enabled. |