From 4c4746cd2cabc642d2492f6a24d1d304b1b9bb66 Mon Sep 17 00:00:00 2001 From: Fab Date: Thu, 10 Sep 2026 09:26:59 +0200 Subject: [PATCH] client soap sympa via socket et non plus via port tcp --- bin/createUser.sh | 19 ++++++++++++++++--- dockers/sympa/config/start.sh | 2 ++ dockers/sympa/config/supervisord.conf | 3 ++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/bin/createUser.sh b/bin/createUser.sh index d5112f8..a5caa9c 100755 --- a/bin/createUser.sh +++ b/bin/createUser.sh @@ -719,12 +719,25 @@ EOF if [[ "${mode}" = "dev" ]]; then echo "# DEV, on teste l'inscription à sympa"| tee -a "${CMD_SYMPA}" LISTMASTER=$(echo ${LISTMASTERS} | cut -d',' -f1) - echo "docker exec -i sympaServ /usr/lib/sympa/bin/sympa_soap_client.pl --soap_url=${httpProto}://${URL_LISTE}/sympasoap --trusted_application=${SOAP_USER} --trusted_application_password=${SOAP_PASSWORD} --proxy_vars=\"USER_EMAIL=${LISTMASTER}\" --service=add --service_parameters=\"${NL_LIST},${EMAIL_SOUHAITE}\"" | tee -a "${CMD_SYMPA}" + + #avec le vieux client soap + #echo "docker exec -i sympaServ /usr/lib/sympa/bin/sympa_soap_client.pl --soap_url=${httpProto}://${URL_LISTE}/sympasoap --trusted_application=${SOAP_USER} --trusted_application_password=${SOAP_PASSWORD} --proxy_vars=\"USER_EMAIL=${LISTMASTER}\" --service=add --service_parameters=\"${NL_LIST},${EMAIL_SOUHAITE}\"" | tee -a "${CMD_SYMPA}" + + #avec le nouveau clt soap + echo "docker exec -i sympaServ sympa test soap --trusted_application=${SOAP_USER} --trusted_application_password=${SOAP_PASSWORD} --proxy_vars=\"USER_EMAIL=${LISTMASTER}\" --service=add --service_parameters=\"${NL_LIST},${EMAIL_SOUHAITE}\" ${httpProto}://${URL_LISTE}/sympasoap" | tee -a "${CMD_SYMPA}" + else echo "# PROD, on inscrit à sympa"| tee -a "${CMD_SYMPA}" LISTMASTER=$(echo ${LISTMASTERS} | cut -d',' -f1) - echo "docker exec -i sympaServ /usr/lib/sympa/bin/sympa_soap_client.pl --soap_url=${httpProto}://${URL_LISTE}/sympasoap --trusted_application=${SOAP_USER} --trusted_application_password=${SOAP_PASSWORD} --proxy_vars=\"USER_EMAIL=${LISTMASTER}\" --service=add --service_parameters=\"${NL_LIST},${EMAIL_SOUHAITE}\"" | tee -a "${CMD_SYMPA}" - echo "docker exec -i sympaServ /usr/lib/sympa/bin/sympa_soap_client.pl --soap_url=${httpProto}://${URL_LISTE}/sympasoap --trusted_application=${SOAP_USER} --trusted_application_password=${SOAP_PASSWORD} --proxy_vars=\"USER_EMAIL=${LISTMASTER}\" --service=add --service_parameters=\"${NL_LIST},${EMAIL_SECOURS}\"" | tee -a "${CMD_SYMPA}" + + #avec le vieux client soap + #echo "docker exec -i sympaServ /usr/lib/sympa/bin/sympa_soap_client.pl --soap_url=${httpProto}://${URL_LISTE}/sympasoap --trusted_application=${SOAP_USER} --trusted_application_password=${SOAP_PASSWORD} --proxy_vars=\"USER_EMAIL=${LISTMASTER}\" --service=add --service_parameters=\"${NL_LIST},${EMAIL_SOUHAITE}\"" | tee -a "${CMD_SYMPA}" + #echo "docker exec -i sympaServ /usr/lib/sympa/bin/sympa_soap_client.pl --soap_url=${httpProto}://${URL_LISTE}/sympasoap --trusted_application=${SOAP_USER} --trusted_application_password=${SOAP_PASSWORD} --proxy_vars=\"USER_EMAIL=${LISTMASTER}\" --service=add --service_parameters=\"${NL_LIST},${EMAIL_SECOURS}\"" | tee -a "${CMD_SYMPA}" + + #avec le nouveau clt soap + echo "docker exec -i sympaServ sympa test soap --trusted_application=${SOAP_USER} --trusted_application_password=${SOAP_PASSWORD} --proxy_vars=\"USER_EMAIL=${LISTMASTER}\" --service=add --service_parameters=\"${NL_LIST},${EMAIL_SOUHAITE}\" ${httpProto}://${URL_LISTE}/sympasoap" | tee -a "${CMD_SYMPA}" + echo "docker exec -i sympaServ sympa test soap --trusted_application=${SOAP_USER} --trusted_application_password=${SOAP_PASSWORD} --proxy_vars=\"USER_EMAIL=${LISTMASTER}\" --service=add --service_parameters=\"${NL_LIST},${EMAIL_SECOURS}\" ${httpProto}://${URL_LISTE}/sympasoap" | tee -a "${CMD_SYMPA}" + fi if [ "${service[ADMIN_ORGA]}" == "O" ]; then diff --git a/dockers/sympa/config/start.sh b/dockers/sympa/config/start.sh index 91b9ed8..928f506 100755 --- a/dockers/sympa/config/start.sh +++ b/dockers/sympa/config/start.sh @@ -48,4 +48,6 @@ MD5PASS=$(/usr/lib/sympa/bin/sympa.pl --md5_digest=${SOAP_PASSWORD} | cut -d':' sed -i -e "s%SOAP_MD5PASS%${MD5PASS}%g" /etc/sympa/trusted_applications.conf echo "Starting supervisord" +mkdir -p /run/sympa +chown www-data:www-data /run/sympa supervisord -n -c /etc/supervisord.conf diff --git a/dockers/sympa/config/supervisord.conf b/dockers/sympa/config/supervisord.conf index 4a3bf22..e333dcb 100644 --- a/dockers/sympa/config/supervisord.conf +++ b/dockers/sympa/config/supervisord.conf @@ -94,6 +94,7 @@ stdout_events_enabled=true stderr_events_enabled=true [program:sympa-soap-fcgi] -command=/usr/bin/spawn-fcgi -n -u sympa -g sympa -a 127.0.0.1 -p 8443 /usr/lib/cgi-bin/sympa/sympa_soap_server.fcgi +#command=/usr/bin/spawn-fcgi -n -u sympa -g sympa -a 127.0.0.1 -p 8443 /usr/lib/cgi-bin/sympa/sympa_soap_server.fcgi +command=/usr/bin/spawn-fcgi -n -u sympa -g sympa -s /run/sympa/sympasoap.socket -M 0660 -U www-data -G www-data /usr/lib/cgi-bin/sympa/sympa_soap_server.fcgi stdout_events_enabled=true stderr_events_enabled=true