From 2a380f6e704776570655ad9158b1209b68ef4daa Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sat, 8 Mar 2025 22:43:38 +0100 Subject: [PATCH] - Rename MANTISBT_ADMIN env varable into MANTISBT_ADMIN_ENABLED. --- Dockerfile | 2 +- ReleaseNotes.txt | 2 +- compose.yaml | 12 ++++++------ env.dist | 20 ++++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75169ec..dfbc4ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ ARG MANTISBT='#!/bin/bash chown -R apache:apache ${APACHE_DOC_ROOT} \n\ chmod -R u-x,g-x,o-rwx,u+X,g+X ${APACHE_DOC_ROOT} \n\ \n\ -if [[ "${MANTISBT_ADMIN}" == "DISABLED" ]] \n\ +if [[ "${MANTISBT_ADMIN_ENABLED}" == "FALSE" ]] \n\ then \n\ chown root:root ${APACHE_DOC_ROOT}/mantisbt/admin \n\ mv ${APACHE_DOC_ROOT}/mantisbt/admin ${APACHE_DOC_ROOT}/mantisbt/admin.disabled \n\ diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 3a7c770..2480e96 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -3,7 +3,7 @@ Rx3-Docker/MantisBT V 1.0.1 - A. GIBERT - 2025/03/08 ------------------------------------------------------------------------------------------------------------------------------------ - Add default config in etc/mantisbt/config_inc.php.ref, -- Add MANTISBT_ADMIN env variable to disable admin directory access, +- Add MANTISBT_ADMIN_ENABLED env variable to disable admin directory access, - Add var/www/mantisbt/images-local volume allowing logo addition, - Add ssmtp program and SMTP_SERVER env variable to allow mail sending, - Add php xmlreader & xmlwriter module tu support "Import/Export issues" plugin, diff --git a/compose.yaml b/compose.yaml index 475183d..5ef3945 100644 --- a/compose.yaml +++ b/compose.yaml @@ -68,13 +68,13 @@ services: SERVER_CROND_ENABLED: ${WA_CROND_ENABLED} APACHE_UID: ${WA_USER_ID} APACHE_GID: ${WA_GROUP_ID} - APACHE_DOC_ROOT: ${APACHE_DOC_ROOT} + APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT} - MANTISBT_ADMIN: ${MANTISBT_ADMIN} - SMTP_SERVER: ${SMTP_SERVER} - WINDOW_TITLE: ${WINDOW_TITLE} - LOGO_IMG: ${LOGO_IMG} - APPL_URL: ${APPL_URL} + MANTISBT_ADMIN_ENABLED: ${WA_MANTISBT_ADMIN_ENABLED} + SMTP_SERVER: ${WA_SMTP_SERVER} + WINDOW_TITLE: ${WA_WINDOW_TITLE} + LOGO_IMG: ${WA_LOGO_IMG} + APPL_URL: ${WA_APPL_URL} volumes: - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} diff --git a/env.dist b/env.dist index 98c7e34..5736cad 100644 --- a/env.dist +++ b/env.dist @@ -100,7 +100,7 @@ DB_SERVER_NAME="MantisBT" # WebApp #------------------------------------------------------------------------------- -APACHE_DOC_ROOT=/var/www/html +WA_APACHE_DOC_ROOT=/var/www/html WA_CROND_ENABLED="FALSE" @@ -108,23 +108,23 @@ WA_LOG_HTTPD_EXT="./var/log/httpd-webapp" WA_LOG_HTTPD_INT="/var/log/httpd" WA_CONF_EXT=./etc/${APPL_NAME} -WA_CONF_INT=${APACHE_DOC_ROOT}/${APPL_NAME}/config +WA_CONF_INT=${WA_APACHE_DOC_ROOT}/${APPL_NAME}/config docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref -SMTP_SERVER="mail.rx3.net" -WINDOW_TITLE="MantisBT - Arena-SI" -LOGO_IMG="images-local/arena-si.jpg" +WA_SMTP_SERVER="mail.rx3.net" +WA_WINDOW_TITLE="MantisBT - Arena-SI" +WA_LOGO_IMG="images-local/arena-si.jpg" if [[ "${APPL_ENV}" != "prd" ]] then - APPL_URL="http://localhost:${WA_PORT_MAIN_EXT}/${APPL_NAME}/" + WA_APPL_URL="http://localhost:${WA_PORT_MAIN_EXT}/${APPL_NAME}/" else - APPL_URL="https://private.arena-si.fr/tools/${APPL_NAME}/" + WA_APPL_URL="https://private.arena-si.fr/tools/${APPL_NAME}/" fi -MANTISBT_ADMIN="ENABLED" -#MANTISBT_ADMIN="DISABLED" +WA_MANTISBT_ADMIN_ENABLED="TRUE" +#WA_MANTISBT_ADMIN_ENABLED="FALSE" WA_IMG_EXT=./var/www/html/${APPL_NAME}/images-local -WA_IMG_INT=${APACHE_DOC_ROOT}/${APPL_NAME}/images-local +WA_IMG_INT=${WA_APACHE_DOC_ROOT}/${APPL_NAME}/images-local