diff options
author | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 14:18:04 +0400 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-28 14:18:04 +0400 |
commit | 8067a1394e3dab551e65ec8abd12e673a811bf40 (patch) | |
tree | fd18fac68c7ca62ee50142e771f0da70a9c0925d /config/config.sample.php | |
parent | dbb0d0407324830f4a7ff51781c535c1cb0d2a06 (diff) | |
parent | 857b15db3739fe8fbbad4df0f10e9b48ba1f90c2 (diff) |
fix merge conflicts
Diffstat (limited to 'config/config.sample.php')
-rw-r--r-- | config/config.sample.php | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index a02116aa4b9..05663a09a46 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1,5 +1,7 @@ <?php +/* Only enable this for local development and not in productive environments */ +/* This will disable the minifier and outputs some additional debug informations */ define("DEBUG", true); $CONFIG = array( @@ -66,6 +68,9 @@ $CONFIG = array( /* URL of the appstore to use, server should understand OCS */ "appstoreurl" => "http://api.apps.owncloud.com/v1", +/* Enable SMTP class debugging */ +"mail_smtpdebug" => false, + /* Mode to use for sending mail, can be sendmail, smtp, qmail or php, see PHPMailer docs */ "mail_smtpmode" => "sendmail", @@ -75,11 +80,22 @@ $CONFIG = array( /* Port to use for sending mail, depends on mail_smtpmode if this is used */ "mail_smtpport" => 25, +/* SMTP server timeout in seconds for sending mail, depends on mail_smtpmode if this is used */ +"mail_smtptimeout" => 10, + +/* SMTP connection prefix or sending mail, depends on mail_smtpmode if this is used. + Can be '', ssl or tls */ +"mail_smtpsecure" => "", + /* authentication needed to send mail, depends on mail_smtpmode if this is used * (false = disable authentication) */ "mail_smtpauth" => false, +/* authentication type needed to send mail, depends on mail_smtpmode if this is used + * Can be LOGIN (default), PLAIN or NTLM */ +"mail_smtpauthtype" => "LOGIN", + /* Username to use for sendmail mail, depends on mail_smtpauth if this is used */ "mail_smtpname" => "", @@ -107,6 +123,9 @@ $CONFIG = array( /* Lifetime of the remember login cookie, default is 15 days */ "remember_login_cookie_lifetime" => 60*60*24*15, +/* Custom CSP policy, changing this will overwrite the standard policy */ +"custom_csp_policy" => "default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *", + /* The directory where the user data is stored, default to data in the owncloud * directory. The sqlite database is also stored here, when sqlite is used. */ |