From 69cda8168b8a5373e7fbe90dccb97db8f67ae2c2 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Mon, 15 Nov 2021 22:39:39 +0000
Subject: [PATCH] 3.3.5-debian-10-r41 release

---
 bitnami/phpbb/3/debian-10/Dockerfile                      | 4 ++--
 .../3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh   | 8 ++++----
 bitnami/phpbb/README.md                                   | 4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bitnami/phpbb/3/debian-10/Dockerfile b/bitnami/phpbb/3/debian-10/Dockerfile
index 08887b981b21..afcdb6b0023a 100644
--- a/bitnami/phpbb/3/debian-10/Dockerfile
+++ b/bitnami/phpbb/3/debian-10/Dockerfile
@@ -20,8 +20,8 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/php/postunpack.sh
+RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/phpbb/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
@@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="phpbb" \
-    BITNAMI_IMAGE_VERSION="3.3.5-debian-10-r40" \
+    BITNAMI_IMAGE_VERSION="3.3.5-debian-10-r41" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
index 99c18af35cd6..bf287455b46c 100644
--- a/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
+++ b/bitnami/phpbb/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh
@@ -435,8 +435,8 @@ ensure_apache_app_configuration_exists() {
     fi
     # App .htaccess support (only when type is not defined)
     export htaccess_include
-    [[ -z "$type" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
-    if [[ -z "$type" && -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
+    [[ -z "$type" || "$type" = "php" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
+    if [[ -z "$type" || "$type" = "php" ]] && [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
         allow_override="None"
         htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\""
     else
@@ -575,8 +575,8 @@ ensure_apache_prefix_configuration_exists() {
     done
     # App .htaccess support (only when type is not defined)
     export htaccess_include
-    [[ -z "$type" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
-    if [[ -z "$type" && -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
+    [[ -z "$type" || "$type" = "php" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root"
+    if [[ -z "$type" || "$type" = "php" ]] && [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then
         allow_override="None"
         htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\""
     else
diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md
index 013f04554ce1..ceacc0552cf0 100644
--- a/bitnami/phpbb/README.md
+++ b/bitnami/phpbb/README.md
@@ -6,6 +6,8 @@
 
 [Overview of phpBB](http://www.phpbb.com)
 
+Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement.
+
 ## TL;DR
 
 ```console
@@ -41,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`3`, `3-debian-10`, `3.3.5`, `3.3.5-debian-10-r40`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.5-debian-10-r40/3/debian-10/Dockerfile)
+* [`3`, `3-debian-10`, `3.3.5`, `3.3.5-debian-10-r41`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.5-debian-10-r41/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpbb GitHub repo](https://github.com/bitnami/bitnami-docker-phpbb).