summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2013-02-16 10:01:23 -0800
committerAndreas Gohr <andi@splitbrain.org>2013-02-16 10:01:23 -0800
commitbf1b11a7f6f7f6180fbb55cc243ac4c977989529 (patch)
tree245a4674bab2ea3148e06dd0879e65c157a497e7 /lib
parent5398a7b652eabdd0a20f154b97b60f89cad72f8c (diff)
parent87bba75a4043643511c89cb89ef9cf11e59fbf2c (diff)
downloadrpg-bf1b11a7f6f7f6180fbb55cc243ac4c977989529.tar.gz
rpg-bf1b11a7f6f7f6180fbb55cc243ac4c977989529.tar.bz2
Merge pull request #178 from whoopdedo/passcryptconfig
Add django compatible hashes to the config options.
Diffstat (limited to 'lib')
-rw-r--r--lib/plugins/config/settings/config.metadata.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index 663eab9dd..bdbc4311f 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -127,7 +127,7 @@ $meta['_authentication'] = array('fieldset');
$meta['useacl'] = array('onoff');
$meta['autopasswd'] = array('onoff');
$meta['authtype'] = array('authtype');
-$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','mediawiki','bcrypt','sha512'));
+$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','mediawiki','bcrypt','djangomd5','djangosha1','sha512'));
$meta['defaultgroup']= array('string');
$meta['superuser'] = array('string');
$meta['manager'] = array('string');