From 572082cd5fe66515a5636b8d91136d285b284425 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Mon, 16 Dec 2019 12:26:40 +0100
Subject: [PATCH] fill_teams: also generate apr1 htpasswd

---
 admin/fill_teams.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin/fill_teams.sh b/admin/fill_teams.sh
index 76ad1581..a51cea40 100755
--- a/admin/fill_teams.sh
+++ b/admin/fill_teams.sh
@@ -64,13 +64,17 @@ new_team() {
 
 	    [ "${GEN_PASSWD}" -eq 1 ] && {
 		PASSWD=$(pwgen -r '\\' -B -y 12)
+		NP=$(echo $N | cut -d : -f 1 | sed 's/[[:upper:]]/\l&/g;s/[âáàä]/a/g;s/[êéèë]/e/g')
 		cat >> teams.pass <<EOF
 ${N}:${PASSWD}
 EOF
-		NP=$(echo $N | cut -d : -f 1 | sed 's/[[:upper:]]/\l&/g;s/[âáàä]/a/g;s/[êéèë]/e/g')
 		SALT="$(openssl rand -base64 3)"
 		HASHED="{SSHA}$(echo -n $PASSWD$SALT | openssl dgst -binary -sha1 | sed 's#$#'"$SALT"'#' | base64)"
-		cat >> htpasswd <<EOF
+		cat >> htpasswd.ssha <<EOF
+${NP}:${HASHED}
+EOF
+		HASHED="$(echo -n $PASSWD | openssl passwd -apr1 -in -)"
+		cat >> htpasswd.apr1 <<EOF
 ${NP}:${HASHED}
 EOF
 	    }