Use bcrypt
This commit is contained in:
parent
b8cfaf23d0
commit
ef4dd4fa38
|
@ -49,7 +49,7 @@ radicale_variables=(ONION_ONLY
|
||||||
function remove_user_radicale {
|
function remove_user_radicale {
|
||||||
remove_username="$1"
|
remove_username="$1"
|
||||||
if grep "$remove_username:" ${RADICALE_DIRECTORY}/users; then
|
if grep "$remove_username:" ${RADICALE_DIRECTORY}/users; then
|
||||||
sed -i "/$remove_username/d" ${RADICALE_DIRECTORY}/users
|
sed -i "/$remove_username:/d" ${RADICALE_DIRECTORY}/users
|
||||||
systemctl reload radicale
|
systemctl reload radicale
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -57,10 +57,13 @@ function remove_user_radicale {
|
||||||
function add_user_radicale {
|
function add_user_radicale {
|
||||||
new_username="$1"
|
new_username="$1"
|
||||||
new_user_password="$2"
|
new_user_password="$2"
|
||||||
new_user_hash=$(echo -n "$new_user_password" | sha1sum | awk -F ' ' '{print $1}')
|
|
||||||
|
|
||||||
if ! grep "$new_username:$new_user_hash" ${RADICALE_DIRECTORY}/users; then
|
if [ ! -f ${RADICALE_DIRECTORY}/users ]; then
|
||||||
printf "$new_username:$new_user_hash\n" >> ${RADICALE_DIRECTORY}/users
|
touch ${RADICALE_DIRECTORY}/users
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! grep "$new_username:" ${RADICALE_DIRECTORY}/users; then
|
||||||
|
htpasswd -Bb ${RADICALE_DIRECTORY}/users "$new_username" "$new_user_password"
|
||||||
systemctl reload radicale
|
systemctl reload radicale
|
||||||
fi
|
fi
|
||||||
echo '0'
|
echo '0'
|
||||||
|
@ -207,7 +210,7 @@ function install_radicale {
|
||||||
fi
|
fi
|
||||||
chown -R www-data:www-data /var/log/radicale
|
chown -R www-data:www-data /var/log/radicale
|
||||||
|
|
||||||
apt-get -yq install python-radicale uwsgi uwsgi-plugin-python radicale
|
apt-get -yq install python-radicale uwsgi uwsgi-plugin-python radicale apache2-utils
|
||||||
|
|
||||||
if [ ! -d ${RADICALE_DIRECTORY} ]; then
|
if [ ! -d ${RADICALE_DIRECTORY} ]; then
|
||||||
echo $"ERROR: radicale does not appear to have installed"
|
echo $"ERROR: radicale does not appear to have installed"
|
||||||
|
@ -226,7 +229,7 @@ function install_radicale {
|
||||||
echo '[auth]' > ${RADICALE_DIRECTORY}/config
|
echo '[auth]' > ${RADICALE_DIRECTORY}/config
|
||||||
echo 'type = htpasswd' >> ${RADICALE_DIRECTORY}/config
|
echo 'type = htpasswd' >> ${RADICALE_DIRECTORY}/config
|
||||||
echo "htpasswd_filename = ${RADICALE_DIRECTORY}/users" >> ${RADICALE_DIRECTORY}/config
|
echo "htpasswd_filename = ${RADICALE_DIRECTORY}/users" >> ${RADICALE_DIRECTORY}/config
|
||||||
echo 'htpasswd_encryption = sha1' >> ${RADICALE_DIRECTORY}/config
|
echo 'htpasswd_encryption = bcrypt' >> ${RADICALE_DIRECTORY}/config
|
||||||
echo '' >> ${RADICALE_DIRECTORY}/config
|
echo '' >> ${RADICALE_DIRECTORY}/config
|
||||||
echo '[rights]' >> ${RADICALE_DIRECTORY}/config
|
echo '[rights]' >> ${RADICALE_DIRECTORY}/config
|
||||||
echo 'type = owner_only' >> ${RADICALE_DIRECTORY}/config
|
echo 'type = owner_only' >> ${RADICALE_DIRECTORY}/config
|
||||||
|
|
Loading…
Reference in New Issue