Changeset 97d7c63 in mod_gnutls


Ignore:
Timestamp:
Oct 10, 2017, 1:37:04 PM (8 months ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, master, upstream
Children:
967bf9b
Parents:
e00d91a
Message:

Test suite: Port config for proxy backend in Makefile and Apache config

The shell function for server start does not need to care about the
port assignment any more, simplifying the code.

Location:
test
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • test/Makefile.am

    re00d91a r97d7c63  
    211211# port for MSVA in test cases that use it
    212212MSVA_PORT ?= 9933
    213 # port for OCSP server (Apache vhost if enabled)
     213# port for TLS proxy backend server
     214BACKEND_PORT ?= 9934
     215# port for the OCSP responder
    214216if ENABLE_OCSP_TEST
    215217OCSP_PORT ?= 9936
    … …  
    230232        export TEST_QUERY_TIMEOUT="@TEST_QUERY_TIMEOUT@"; \
    231233        export BACKEND_HOST="@TEST_HOST@"; \
     234        export BACKEND_PORT="$(BACKEND_PORT)"; \
    232235        export HTTP_CLI="@HTTP_CLI@";
    233236

  • test/proxy_backend.bash

    re00d91a r97d7c63  
    33set -e
    44. ${srcdir}/common.bash
    5 
    6 if [ -z "${BACKEND_HOST}" ]; then
    7     export BACKEND_HOST="localhost"
    8 fi
    9 if [ -z "${BACKEND_PORT}" ]; then
    10     export BACKEND_PORT="9934"
    11 fi
    12 : ${srcdir:="."}
    13 : ${APACHE2:="apache2"}
    14 : ${TEST_LOCK_WAIT:="30"}
    155
    166function backend_apache
    … …  
    2818    (
    2919        export TEST_NAME
    30         export TEST_PORT="${BACKEND_PORT}"
    3120        export srcdir="$(realpath ${srcdir})"
    3221        local flock_cmd=""

  • test/proxy_backend.conf.in

    re00d91a r97d7c63  
     1# redefine TEST_PORT before loading the base config
     2Define  TEST_PORT       ${BACKEND_PORT}
     3Include ${srcdir}/base_apache.conf
     4
    15# common options for proxy backend servers
    26CustomLog       logs/${TEST_NAME}.backend.access.log combined

  • test/tests/19_TLS_reverse_proxy/backend.conf

    re00d91a r97d7c63  
    1 Include ${srcdir}/base_apache.conf
    2 Include proxy_backend.conf
     1Include ${PWD}/proxy_backend.conf
    32
    43GnuTLSCache dbm cache/gnutls_cache

  • test/tests/20_TLS_reverse_proxy_client_auth/backend.conf

    re00d91a r97d7c63  
    1 Include ${srcdir}/base_apache.conf
    2 Include proxy_backend.conf
     1Include ${PWD}/proxy_backend.conf
    32
    43GnuTLSCache dbm cache/gnutls_cache

  • test/tests/21_TLS_reverse_proxy_wrong_cert/backend.conf

    re00d91a r97d7c63  
    1 Include ${srcdir}/base_apache.conf
    2 Include proxy_backend.conf
     1Include ${PWD}/proxy_backend.conf
    32
    43GnuTLSCache dbm cache/gnutls_cache

  • test/tests/22_TLS_reverse_proxy_crl_revoke/backend.conf

    re00d91a r97d7c63  
    1 Include ${srcdir}/base_apache.conf
    2 Include proxy_backend.conf
     1Include ${PWD}/proxy_backend.conf
    32
    43GnuTLSCache dbm cache/gnutls_cache

  • test/tests/23_TLS_reverse_proxy_mismatched_priorities/backend.conf

    re00d91a r97d7c63  
    1 Include ${srcdir}/base_apache.conf
    2 Include proxy_backend.conf
     1Include ${PWD}/proxy_backend.conf
    32
    43GnuTLSCache dbm cache/gnutls_cache
Note: See TracChangeset for help on using the changeset viewer.