WIP: CI3 migration

Signed-off-by: Florian Pritz <bluewind@xinu.at>

4 files changed, 6 insertions, 7 deletions

diff --git a/application/config/config.php b/application/config/config.php
index 1f71d74eb..40212b2f3 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -384,7 +384,7 @@ $config['encryption_key'] = '';
 $config['sess_driver'] = 'database';
 $config['sess_cookie_name'] = 'ci_session';
 $config['sess_expiration'] = 7200;
-$config['sess_save_path'] = NULL;
+$config['sess_save_path'] = "ci_sessions";
 $config['sess_match_ip'] = FALSE;
 $config['sess_time_to_update'] = 300;
 $config['sess_regenerate_destroy'] = FALSE;
@@ -641,4 +641,4 @@ $config['download_nginx_location'] = '/protected-uploads';
 
 if (file_exists(APPPATH.'config/config-local.php')) {
 	include APPPATH.'config/config-local.php';
-}
\ No newline at end of file
+}
diff --git a/application/config/example/database.php b/application/config/example/database.php
index 7776851ae..b4cb64039 100644
--- a/application/config/example/database.php
+++ b/application/config/example/database.php
@@ -96,4 +96,3 @@ $db['default'] = array(
 	'save_queries' => TRUE
 );
 
-}
\ No newline at end of file
diff --git a/application/config/migration.php b/application/config/migration.php
index dad6fcbf7..5b71fc184 100644
--- a/application/config/migration.php
+++ b/application/config/migration.php
@@ -29,7 +29,7 @@ $config['migration_enabled'] = true;
 |       defaults to 'sequential' for backward compatibility with CI2.
 |
 */
-$config['migration_type'] = 'timestamp';
+$config['migration_type'] = 'sequential';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/config/routes.php b/application/config/routes.php
index 896d9d63f..1accd7b95 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -49,12 +49,12 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | Examples:	my-controller/index	-> my_controller/index
 |		my-controller/my-method	-> my_controller/my_method
 */
-$route['default_controller'] = "file/file_default";
+$route['default_controller'] = "main";
 $route['user/(:any)'] = "user/$1";
 $route['file/multipaste/(:any)'] = "file/multipaste/$1";
 $route['file/(:any)'] = "file/file_default/$1";
 $route['tools/(:any)'] = "tools/$1";
-$route['api/(:any)'] = "api/route/$1";
-$route['(:any)'] = "file/file_default/index/$1";
+$route['api/(.+)'] = "api/route/$1";
+$route['(.+)'] = "file/file_default/index/$1";
 $route['404_override'] = '';
 $route['translate_uri_dashes'] = FALSE;