SetAllPass a disparu ! Reste le secretgen à refaire + revoir les valeurs "liées" par setallpass. Rien n'est testé pour le moment.
This commit is contained in:
		@@ -5,7 +5,7 @@ KAZ_ROOT=/kaz
 | 
			
		||||
setKazVars
 | 
			
		||||
 | 
			
		||||
. $DOCKERS_ENV
 | 
			
		||||
. $KAZ_ROOT/secret/SetAllPass.sh
 | 
			
		||||
. $KAZ_BIN_DIR/getPasswords.sh ldapServ
 | 
			
		||||
 | 
			
		||||
LDAP_IP=$(docker inspect -f '{{.NetworkSettings.Networks.ldapNet.IPAddress}}' ldapServ)
 | 
			
		||||
 | 
			
		||||
@@ -20,4 +20,4 @@ EDITOR=${EDITOR:-vi}
 | 
			
		||||
EDITOR=${EDITOR:-vi}
 | 
			
		||||
export EDITOR=${EDITOR}
 | 
			
		||||
 | 
			
		||||
ldapvi -h $LDAP_IP -D "cn=${ldap_LDAP_ADMIN_USERNAME},${ldap_root}" -w ${ldap_LDAP_ADMIN_PASSWORD} --discover
 | 
			
		||||
ldapvi -h $LDAP_IP -D "cn=${ldapServ_LDAP_ADMIN_USERNAME},${ldap_root}" -w ${ldapServ_LDAP_ADMIN_PASSWORD} --discover
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@ KAZ_ROOT=/kaz
 | 
			
		||||
setKazVars
 | 
			
		||||
 | 
			
		||||
. $DOCKERS_ENV
 | 
			
		||||
. $KAZ_ROOT/secret/SetAllPass.sh
 | 
			
		||||
. $KAZ_BIN_DIR/getPasswords.sh ldapServ paheko
 | 
			
		||||
 | 
			
		||||
ACCOUNTS=/kaz/dockers/postfix/config/postfix-accounts.cf
 | 
			
		||||
 | 
			
		||||
@@ -126,7 +126,7 @@ replace: agoraEnabled\n\
 | 
			
		||||
agoraEnabled: TRUE\n\
 | 
			
		||||
-\n\
 | 
			
		||||
replace: mobilizonEnabled\n\
 | 
			
		||||
mobilizonEnabled: TRUE\n\n" | tee /tmp/ldap/${mail}.ldif | ldapmodify -c -H ldap://${LDAP_IP} -D "cn=${ldap_LDAP_ADMIN_USERNAME},${ldap_root}" -x -w ${ldap_LDAP_ADMIN_PASSWORD}
 | 
			
		||||
mobilizonEnabled: TRUE\n\n" | tee /tmp/ldap/${mail}.ldif | ldapmodify -c -H ldap://${LDAP_IP} -D "cn=${ldapServ_LDAP_ADMIN_USERNAME},${ldap_root}" -x -w ${ldapServ_LDAP_ADMIN_PASSWORD}
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
#replace: nextcloudEnabled\n\
 | 
			
		||||
@@ -164,7 +164,7 @@ do
 | 
			
		||||
			echo -e "dn: cn=${mail},ou=users,${ldap_root}\n\
 | 
			
		||||
changeType: modify
 | 
			
		||||
replace: mailAlias\n\
 | 
			
		||||
$LIST\n\n" | ldapmodify -c -H ldap://${LDAP_IP} -D "cn=${ldap_LDAP_ADMIN_USERNAME},${ldap_root}" -x -w ${ldap_LDAP_ADMIN_PASSWORD}
 | 
			
		||||
$LIST\n\n" | ldapmodify -c -H ldap://${LDAP_IP} -D "cn=${ldapServ_LDAP_ADMIN_USERNAME},${ldap_root}" -x -w ${ldapServ_LDAP_ADMIN_PASSWORD}
 | 
			
		||||
		else
 | 
			
		||||
			echo "Alias vers un mail externe, go fichier"
 | 
			
		||||
			echo $line >> ${ALIASES_WITHLDAP}
 | 
			
		||||
@@ -185,7 +185,7 @@ replace: mailAlias\n\
 | 
			
		||||
mailAlias: ${src}\n\
 | 
			
		||||
-\n\
 | 
			
		||||
replace: mail\n\
 | 
			
		||||
mail: ${dst}\n\n" | ldapmodify -c -H ldap://${LDAP_IP} -D "cn=${ldap_LDAP_ADMIN_USERNAME},${ldap_root}" -x -w ${ldap_LDAP_ADMIN_PASSWORD}
 | 
			
		||||
mail: ${dst}\n\n" | ldapmodify -c -H ldap://${LDAP_IP} -D "cn=${ldapServ_LDAP_ADMIN_USERNAME},${ldap_root}" -x -w ${ldapServ_LDAP_ADMIN_PASSWORD}
 | 
			
		||||
		fi
 | 
			
		||||
	else
 | 
			
		||||
		echo "Forward vers plusieurs adresses, on met dans le fichier"
 | 
			
		||||
@@ -215,7 +215,7 @@ replace: mailAlias\n\
 | 
			
		||||
mailAlias: ${src}\n\
 | 
			
		||||
-\n\
 | 
			
		||||
replace: mail\n\
 | 
			
		||||
${LIST}\n\n" | ldapmodify -c -H ldap://${LDAP_IP} -D "cn=${ldap_LDAP_ADMIN_USERNAME},${ldap_root}" -x -w ${ldap_LDAP_ADMIN_PASSWORD}
 | 
			
		||||
${LIST}\n\n" | ldapmodify -c -H ldap://${LDAP_IP} -D "cn=${ldapServ_LDAP_ADMIN_USERNAME},${ldap_root}" -x -w ${ldapServ_LDAP_ADMIN_PASSWORD}
 | 
			
		||||
 | 
			
		||||
	fi
 | 
			
		||||
done
 | 
			
		||||
 
 | 
			
		||||
@@ -6,15 +6,16 @@ setKazVars
 | 
			
		||||
 | 
			
		||||
. $DOCKERS_ENV
 | 
			
		||||
. $KAZ_ROOT/secret/SetAllPass.sh
 | 
			
		||||
. $KAZ_BIN_DIR/getPasswords.sh ldapServ nextcloudDB
 | 
			
		||||
 | 
			
		||||
LDAP_IP=$(docker inspect -f '{{.NetworkSettings.Networks.ldapNet.IPAddress}}' ldapServ)
 | 
			
		||||
 | 
			
		||||
docker exec -i nextcloudDB mysql --user=${nextcloud_MYSQL_USER} --password=${nextcloud_MYSQL_PASSWORD} ${nextcloud_MYSQL_DATABASE} <<< "select uid from oc_users;" > /tmp/nc_users.txt
 | 
			
		||||
docker exec -i nextcloudDB mysql --user=${nextcloudDB_MYSQL_USER} --password=${nextcloudDB_MYSQL_PASSWORD} ${nextcloudDB_MYSQL_DATABASE} <<< "select uid from oc_users;" > /tmp/nc_users.txt
 | 
			
		||||
 | 
			
		||||
OLDIFS=${IFS}
 | 
			
		||||
IFS=$'\n'
 | 
			
		||||
for line in `cat /tmp/nc_users.txt`; do
 | 
			
		||||
	result=$(ldapsearch -h $LDAP_IP -D "cn=${ldap_LDAP_ADMIN_USERNAME},${ldap_root}" -w ${ldap_LDAP_ADMIN_PASSWORD} -b $ldap_root -x "(identifiantKaz=${line})" | grep numEntries)
 | 
			
		||||
	result=$(ldapsearch -h $LDAP_IP -D "cn=${ldapServ_LDAP_ADMIN_USERNAME},${ldap_root}" -w ${ldapServ_LDAP_ADMIN_PASSWORD} -b $ldap_root -x "(identifiantKaz=${line})" | grep numEntries)
 | 
			
		||||
	echo "${line} ${result}" | grep -v "numEntries: 1" | grep -v "^uid"
 | 
			
		||||
done
 | 
			
		||||
IFS=${OLDIFS}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user