diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh index f0817e70..15c2286c 100755 --- a/.github/prepare_debian.sh +++ b/.github/prepare_debian.sh @@ -80,33 +80,10 @@ a2ensite default-ssl rm /etc/ssl/certs/ssl-cert-snakeoil.pem rm /etc/ssl/private/ssl-cert-snakeoil.key openssl req -nodes -newkey rsa:2048 -x509 -sha256 -days 365 -nodes -keyout /etc/ssl/private/ssl-cert-snakeoil.key -out /etc/ssl/certs/ssl-cert-snakeoil.pem -subj "/C=GB/ST=London/L=London/O=Global Security/OU=IT Department/CN=$(hostname)" - # add a subdomain for testing -cat >/etc/apache2/sites-available/subdomain1.conf < - ServerName subdomain1.localhost.com - DocumentRoot /var/www/subdomain1 - - ErrorLog \${APACHE_LOG_DIR}/subdomain1_error.log - CustomLog \${APACHE_LOG_DIR}/subdomain1_access.log combined - - - - ServerName subdomain1.localhost.com - DocumentRoot /var/www/subdomain1 - - SSLEngine on - SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem - SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key - - ErrorLog \${APACHE_LOG_DIR}/subdomain1_ssl_error.log - CustomLog \${APACHE_LOG_DIR}/subdomain1_ssl_access.log combined - -EOL +cp tools/subdomain1/subdomain1.conf /etc/apache2/sites-available/ mkdir -p /var/www/subdomain1 -cat >/var/www/subdomain1/index.php <> /etc/hosts echo '127.0.0.1 subdomain1.localhost.com' >> /etc/hosts apache2ctl configtest diff --git a/tools/subdomain1/index.php b/tools/subdomain1/index.php new file mode 100644 index 00000000..e97b19f5 --- /dev/null +++ b/tools/subdomain1/index.php @@ -0,0 +1 @@ +Subdomain: subdomain1.localhost.com diff --git a/tools/subdomain1/subdomain1.conf b/tools/subdomain1/subdomain1.conf new file mode 100644 index 00000000..74521792 --- /dev/null +++ b/tools/subdomain1/subdomain1.conf @@ -0,0 +1,22 @@ +# This apache configuration file is used testing +# check_curl tests use this subdomain to see if --noproxy works on subdomains of a domain. + + + ServerName subdomain1.localhost.com + DocumentRoot /var/www/subdomain1 + + ErrorLog ${APACHE_LOG_DIR}/subdomain1_error.log + CustomLog ${APACHE_LOG_DIR}/subdomain1_access.log combined + + + + ServerName subdomain1.localhost.com + DocumentRoot /var/www/subdomain1 + + SSLEngine on + SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem + SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key + + ErrorLog ${APACHE_LOG_DIR}/subdomain1_ssl_error.log + CustomLog ${APACHE_LOG_DIR}/subdomain1_ssl_access.log combined +