Change default database to sqlite, begin 2.0 db_flatfile support

2 files changed, 12 insertions, 35 deletions

diff --git a/data/anope.example.conf b/data/anope.example.conf
index 8c9be4f64..29b8e2481 100644
--- a/data/anope.example.conf
+++ b/data/anope.example.conf
@@ -1058,11 +1058,13 @@ mail
 }
 
 /*
- * [RECOMMENDED] db_flatfile
+ * [DEPRECATED] db_flatfile
  *
- * This is the default flatfile database format.
+ * This is the default database format from Anope 2.0. This module only loads these databases,
+ * and will NOT save them. You should only use this to upgrade old databases to a newer database
+ * format.
  */
-module
+#module
 {
 	name = "database/flatfile"
 
@@ -1070,40 +1072,15 @@ module
 	 * The database name db_flatfile should use
 	 */
 	database = "anope.db"
-
-	/*
-	 * Sets the number of days backups of databases are kept. If you don't give it,
-	 * or if you set it to 0, Anope won't backup the databases.
-	 *
-	 * NOTE: Anope must run 24 hours a day for this feature to work.
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	keepbackups = 3
-
-	/*
-	 * Allows Anope to continue file write operations (i.e. database saving)
-	 * even if the original file cannot be backed up. Enabling this option may
-	 * allow Anope to continue operation under conditions where it might
-	 * otherwise fail, such as a nearly-full disk.
-	 *
-	 * NOTE: Enabling this option can cause irrecoverable data loss under some
-	 * conditions, so make CERTAIN you know what you're doing when you enable it!
-	 *
-	 * This directive is optional, and you are discouraged against enabling it.
-	 */
-	#nobackupokay = yes
 }
 
 /*
- * db_sql
- *
- * db_sql allows saving and loading databases using one of the SQL engines.
- * This module reads and writes to SQL in real time. Changes to the SQL tables
- * will be immediately reflected into Anope.
+ * [RECOMMENDED] db_sql
  *
+ * db_sql allows using one of the SQL engines as a database backend, and is
+ * the default database module.
  */
-#module
+module
 {
 	name = "database/sql"
 
@@ -1116,7 +1093,7 @@ module
 	/*
 	 * An optional prefix to prepended to the name of each created table.
 	 */
-	#prefix = "anope_db_"
+	#prefix = "anope_"
 }
 
 /*
diff --git a/data/modules.example.conf b/data/modules.example.conf
index b75fcd550..0f22a7c72 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -647,7 +647,7 @@ module { name = "help" }
  *
  * This module allows other modules to use SQLite.
  */
-#module
+module
 {
 	name = "sqlite"
 
@@ -658,7 +658,7 @@ module { name = "help" }
 		name = "sqlite/main"
 
 		/* The database name, it will be created if it does not exist. */
-		database = "anope.db"
+		database = "anope.sqlite3"
 	}
 }