From 75ee38963e057cba71a80502837e001af58eaa39 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Fri, 16 Oct 2026 13:03:44 +0200 Subject: [PATCH] - Fix calendar & http_authentication: update plugin orger in config. --- Dockerfile | 5 +++-- ReleaseNotes.txt | 2 +- env.dist | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a5f4ac..b830f06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -116,8 +116,9 @@ RUN . /etc/profile.d/rx3.sh && isl --add ${IMG_URL} && sed -i -e "s/^\$config\['imap_host'\].*/\$config['imap_host'] = 'RCM_CONFIG_IMAP';/" "${RCM_CONFIG_FILE}" \ && sed -i -e "s/^\$config\['product_name'\].*/\$config['product_name'] = 'RCM_CONFIG_NAME';/" "${RCM_CONFIG_FILE}" \ && sed -i -e "s%^\$config\['enigma_pgp_homedir'\].*%\$config['enigma_pgp_homedir'] = '${RCM_ENIGMA_DIR}';%" "${RCM_CONFIG_DIR}/enigma.inc.php" \ - && sed -i -e "/^ 'archive',/a\ 'http_authentication',\n 'libcalendaring',\n 'password'," "${RCM_CONFIG_FILE}" \ - && sed -i -e "/^ 'archive',/a\ 'calendar',\n 'carddav',\n 'emoticons',\n 'enigma'," "${RCM_CONFIG_FILE}" \ + && sed -i -e "s/^ 'archive',/ 'http_authentication',\n 'archive',/" "${RCM_CONFIG_FILE}" \ + && sed -i -e "/^ 'archive',/a\ 'emoticons',\n 'enigma',\n 'libcalendaring',\n 'password'," "${RCM_CONFIG_FILE}" \ + && sed -i -e "/^ 'archive',/a\ 'calendar',\n 'carddav'," "${RCM_CONFIG_FILE}" \ && echo -e "\n\$config['htmleditor'] = 4;" >> "${RCM_CONFIG_FILE}" \ && echo -e "\n\$config['enable_installer'] = false;" >> "${RCM_CONFIG_FILE}" \ && sed -i -e "s|// vim:|// RCM_CARDDAV_CONFIG\n// vim:|" "${RCM_CONFIG_DIR}/carddav.inc.php" \ diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 5454b3f..9bfc7dd 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/RoundCubeMail V 1.0.1 - A. GIBERT - 2026/10/13 +Rx3-Docker/RoundCubeMail V 1.0.1 - A. GIBERT - 2026/10/16 ------------------------------------------------------------------------------------------------------------------------------------ - Use roundcubemail 1.7.4 from Rx3 Mageia RPM with Calendar 3.6.1. diff --git a/env.dist b/env.dist index 2762950..36308b5 100644 --- a/env.dist +++ b/env.dist @@ -77,7 +77,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="postgres:pgsql httpd:/var/www/html" docker_service_add DB database ${ORG_URL_PREFIX} postgresql - 1.2.0-mga9 - - - postgres - - 5432 - - postgres postgres -docker_service_add WA webapp ${ORG_URL_PREFIX} roundcubemail "Rx3-Docker/RoundCubeMail" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.7.0-mga9 - - 8081 80 - - apache apache +docker_service_add WA webapp ${ORG_URL_PREFIX} roundcubemail "Rx3-Docker/RoundCubeMail" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} php-apache 1.7.0-mga9 - - 8082 80 - - apache apache