ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-04-08 03:24:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Exclude Apache 2.2 from static DirectoryIndex test

Browse Source
This commit is contained in:
cytopia 2019-11-24 10:06:37 +01:00
parent 49d6c68bb5
commit 8f47af8bfb
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.tests/tests/vhost-directory_index.sh
View File

@ -53,6 +53,7 @@ fi
###
TLD_SUFFIX="$( "${SCRIPT_PATH}/../scripts/env-getvar.sh" "TLD_SUFFIX" )"
HTTPD_DOCROOT_DIR="$( "${SCRIPT_PATH}/../scripts/env-getvar.sh" "HTTPD_DOCROOT_DIR" )"
HTTPD_VERSION="$( "${SCRIPT_PATH}/../scripts/env-getvar.sh" "HTTPD_SERVER" )"
###
@ -81,12 +82,18 @@ ERROR=0
###
run "docker-compose exec --user devilbox -T php bash -c 'echo \"indexhtm\" > /shared/httpd/${VHOST}/${HTTPD_DOCROOT_DIR}/index.htm'" "${RETRIES}" "${DVLBOX_PATH}"
printf "[TEST] index.htm should be served by default"
if ! run "docker-compose exec --user devilbox -T php curl -sS --fail 'http://${VHOST}.${TLD_SUFFIX}' | tac | tac | grep -E '^indexhtm$' >/dev/null" "${RETRIES}" "${DVLBOX_PATH}" "0"; then
printf "\\r[FAIL] index.htm should be served by default\\n"
run "docker-compose exec --user devilbox -T php curl -sS 'http://${VHOST}.${TLD_SUFFIX}' || true" "1" "${DVLBOX_PATH}"
ERROR=1
# FIXME: Apache 2.2 currently only serves PHP files as Document Roots due to its FPM implementation
if [ "${HTTPD_VERSION}" != "apache-2.2" ]; then
printf "[TEST] index.htm should be served by default"
if ! run "docker-compose exec --user devilbox -T php curl -sS --fail 'http://${VHOST}.${TLD_SUFFIX}' | tac | tac | grep -E '^indexhtm$' >/dev/null" "${RETRIES}" "${DVLBOX_PATH}" "0"; then
printf "\\r[FAIL] index.htm should be served by default\\n"
run "docker-compose exec --user devilbox -T php curl -sS 'http://${VHOST}.${TLD_SUFFIX}' || true" "1" "${DVLBOX_PATH}"
ERROR=1
else
printf "\\r[OK] index.htm should be served by default\\n"
fi
else
printf "\\r[OK] index.htm should be served by default\\n"
printf "\\r[SKIP] index.htm should be served by default\\n"
fi
@ -95,12 +102,17 @@ fi
###
run "docker-compose exec --user devilbox -T php bash -c 'echo \"indexhtml\" > /shared/httpd/${VHOST}/${HTTPD_DOCROOT_DIR}/index.html'" "${RETRIES}" "${DVLBOX_PATH}"
printf "[TEST] index.html should be served by default"
if ! run "docker-compose exec --user devilbox -T php curl -sS --fail 'http://${VHOST}.${TLD_SUFFIX}' | tac | tac | grep -E '^indexhtml$' >/dev/null" "${RETRIES}" "${DVLBOX_PATH}" "0"; then
printf "\\r[FAIL] index.html should be served by default\\n"
run "docker-compose exec --user devilbox -T php curl -sS 'http://${VHOST}.${TLD_SUFFIX}' || true" "1" "${DVLBOX_PATH}"
ERROR=1
# FIXME: Apache 2.2 currently only serves PHP files as Document Roots due to its FPM implementation
if [ "${HTTPD_VERSION}" != "apache-2.2" ]; then
if ! run "docker-compose exec --user devilbox -T php curl -sS --fail 'http://${VHOST}.${TLD_SUFFIX}' | tac | tac | grep -E '^indexhtml$' >/dev/null" "${RETRIES}" "${DVLBOX_PATH}" "0"; then
printf "\\r[FAIL] index.html should be served by default\\n"
run "docker-compose exec --user devilbox -T php curl -sS 'http://${VHOST}.${TLD_SUFFIX}' || true" "1" "${DVLBOX_PATH}"
ERROR=1
else
printf "\\r[OK] index.html should be served by default\\n"
fi
else
printf "\\r[OK] index.html should be served by default\\n"
printf "\\r[SKIP] index.html should be served by default\\n"
fi