aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorMatt Windsor <mbw500@student.cs.york.ac.uk>2011-02-20 23:49:42 +0000
committerMatt Windsor <mbw500@student.cs.york.ac.uk>2011-02-20 23:49:42 +0000
commitcd972012ab8c40b66bd65f78bbf9e3422413b1aa (patch)
tree726aa9cefa80fc4a2f3922ed6e05cf0074421a6d /res
parente2fc92f5c42dde942e8b71d38b9745b6f3c98053 (diff)
parentf89ef9ed36e8185f53c7d5f22f91935e2c4ccaa0 (diff)
Merge. DatabaseLogin over. Auth = Very Yes.
Diffstat (limited to 'res')
-rw-r--r--res/conf.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/res/conf.xml b/res/conf.xml
index 215695c..4795e94 100644
--- a/res/conf.xml
+++ b/res/conf.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<config version="1.0" >
+<!--
+ Only the first database, and the first auths of each type are used.
+ Proceeding tags are ignored.
+ Do not have empty element nodes as this will break things.
+-->
+
+<config version="1.2" >
<database>
<host>4574.co.uk</host>
@@ -10,8 +16,13 @@
<auth>
<user>xauth</user>
- <pass></pass>
+ <pass>pass</pass>
<type>read_only</type>
</auth>
+ <auth>
+ <user>xwrite</user>
+ <pass>password</pass>
+ <type>read_write</type>
+ </auth>
</config> \ No newline at end of file