diff options
| author | Florian Pritz <bluewind@xinu.at> | 2013-09-25 15:03:59 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2013-09-25 15:03:59 +0200 |
| commit | 6705e6c987b6e4a43bbb666c33d8fc8a0ef1a0a6 (patch) | |
| tree | b815871f7f031633c400a33cf5d6245282d59955 /application/config | |
| parent | 50230001eb5387b6b0ff7ce906d074ef4a530d11 (diff) | |
| parent | ab98249a9a087745b29e5cb258ea0b624f12f64b (diff) | |
Merge branch 'working'
Diffstat (limited to 'application/config')
| -rw-r--r-- | application/config/config.php | 21 | ||||
| -rw-r--r-- | application/config/migration.php | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/application/config/config.php b/application/config/config.php index 388776cda..54870b37b 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -408,9 +408,30 @@ if (extension_loaded("ldap")) { ); } +// This is only used it the driver is set to fluxbb +$config['auth_fluxbb'] = array( + 'database' => 'fluxbb' +); + // possible values: production, development $config['environment'] = "production"; +// This sets the download implementation. Possible values are php, nginx and lighttpd +// The nginx and lighttpd drivers make use of the server's sendfile feature. +$config['download_driver'] = 'php'; +// The lighttpd driver requires the following directive to be set in your fastcgi.server configuration: +// "allow-x-send-file" => "enable" +// See http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModFastCGI#X-Sendfile +// +// When using the nginx download driver you need to define an internal location +// from which nginx will serve your uploads: +// location ^~ /protected-uploads/ { +// internal; +// alias <upload_path>/; +// } +// See http://wiki.nginx.org/X-accel +$config['download_nginx_location'] = '/protected-uploads'; + if (file_exists(FCPATH.'application/config/config-local.php')) { include FCPATH.'application/config/config-local.php'; } diff --git a/application/config/migration.php b/application/config/migration.php index 5fef0ad40..6cfd09a30 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = true; | be upgraded / downgraded to. | */ -$config['migration_version'] = 9; +$config['migration_version'] = 10; /* |