From 8ab1c71d7dc7a0d47e5711dc72e3fc9c3ee850bb Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 29 Dec 2014 17:26:20 -0500
Subject: Allow configuring casemaps

---
 data/CMakeLists.txt |   6 +-
 data/ascii.conf     | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 data/example.conf   |  34 +++++++-----
 data/rfc1459.conf   |  24 ++++++++
 4 files changed, 203 insertions(+), 18 deletions(-)
 create mode 100644 data/ascii.conf
 create mode 100644 data/rfc1459.conf

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8bb635dcf..2515bc082 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,6 +1,4 @@
-# Only install example.chk and example.conf from this directory
-# NOTE: I would've had this just find all files in the directory, but that would include files not needed (like this file)
-set(DATA example.chk botserv.example.conf example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf chanstats.example.conf irc2sql.example.conf stats.standalone.example.conf)
-install(FILES ${DATA}
+file(GLOB DATA_EXAMPLECONFS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.conf")
+install(FILES example.chk ${DATA_EXAMPLECONFS}
   DESTINATION ${CONF_DIR}
 )
diff --git a/data/ascii.conf b/data/ascii.conf
new file mode 100644
index 000000000..1bfcb33f0
--- /dev/null
+++ b/data/ascii.conf
@@ -0,0 +1,157 @@
+
+casemap
+{
+        lower = "a"
+        upper = "A"
+}
+
+casemap
+{
+        lower = "b"
+        upper = "B"
+}
+
+casemap
+{
+        lower = "c"
+        upper = "C"
+}
+
+casemap
+{
+        lower = "d"
+        upper = "D"
+}
+
+casemap
+{
+        lower = "e"
+        upper = "E"
+}
+
+casemap
+{
+        lower = "f"
+        upper = "F"
+}
+
+casemap
+{
+        lower = "g"
+        upper = "G"
+}
+
+casemap
+{
+        lower = "h"
+        upper = "H"
+}
+
+casemap
+{
+        lower = "i"
+        upper = "I"
+}
+
+casemap
+{
+        lower = "j"
+        upper = "J"
+}
+
+casemap
+{
+        lower = "k"
+        upper = "K"
+}
+
+casemap
+{
+        lower = "l"
+        upper = "L"
+}
+
+casemap
+{
+        lower = "m"
+        upper = "M"
+}
+
+casemap
+{
+        lower = "n"
+        upper = "N"
+}
+
+casemap
+{
+        lower = "o"
+        upper = "O"
+}
+
+casemap
+{
+        lower = "p"
+        upper = "P"
+}
+
+casemap
+{
+        lower = "q"
+        upper = "Q"
+}
+
+casemap
+{
+        lower = "r"
+        upper = "R"
+}
+
+casemap
+{
+        lower = "s"
+        upper = "S"
+}
+
+casemap
+{
+        lower = "t"
+        upper = "T"
+}
+
+casemap
+{
+        lower = "u"
+        upper = "U"
+}
+
+casemap
+{
+        lower = "v"
+        upper = "V"
+}
+
+casemap
+{
+        lower = "w"
+        upper = "W"
+}
+
+casemap
+{
+        lower = "x"
+        upper = "X"
+}
+
+casemap
+{
+        lower = "y"
+        upper = "Y"
+}
+
+casemap
+{
+        lower = "z"
+        upper = "Z"
+}
+
diff --git a/data/example.conf b/data/example.conf
index f10c62fb2..f746a2595 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -361,20 +361,6 @@ options
 	#user = "anope"
 	#group = "anope"
 
-	/*
-	 * The case mapping used by services. This must be set to a valid locale name
-	 * installed on your machine. Services use this case map to compare, with
-	 * case insensitivity, things such as nick names, channel names, etc.
-	 *
-	 * We provide two special casemaps shipped with Anope, ascii and rfc1459.
-	 *
-	 * This value should be set to what your IRCd uses, which is probably rfc1459,
-	 * however Anope has always used ascii for comparison, so the default is ascii.
-	 *
-	 * Changing this value once set is not recommended.
-	 */
-	casemap = "ascii"
-
 	/*
 	 * This key is used to initiate the random number generator. This number
 	 * MUST be random as you want your passcodes to be random. Don't give this
@@ -538,6 +524,26 @@ options
 	#defaultlanguage = "es_ES.UTF-8"
 }
 
+/*
+ * [REQUIRED] Casemapping configuration
+ *
+ * Includes the configuration for the casemap services should use.
+ * Services use this case map to compare, with case insensitivity,
+ * things such as nick names, channel names, etc.
+ *
+ * Two casemaps shipped with Anope are ascii and rfc1459.
+ *
+ * This value should be set to what your IRCd uses, which is probably rfc1459,
+ * however Anope has always used ascii for comparison, so the default is ascii.
+ *
+ * Changing this value once set is not recommended.
+ */
+include
+{
+	name = "ascii.conf"
+	#name = "rfc1459.conf"
+}
+
 /*
  * [OPTIONAL] BotServ
  *
diff --git a/data/rfc1459.conf b/data/rfc1459.conf
new file mode 100644
index 000000000..81ced1ac0
--- /dev/null
+++ b/data/rfc1459.conf
@@ -0,0 +1,24 @@
+
+include
+{
+	name = "ascii.conf"
+}
+
+casemap
+{
+	lower = "{"
+	upper = "["
+}
+
+casemap
+{
+	lower = "}"
+	upper = "]"
+}
+
+casemap
+{
+	lower = "|"
+	upper = "\""
+}
+
-- 
cgit