2 files changed, 24 insertions, 4 deletions

diff --git a/.github/NPTest.cache b/.github/NPTest.cache
index 6b463e74..3f6d4da6 100644
--- a/.github/NPTest.cache
+++ b/.github/NPTest.cache
@@ -19,6 +19,13 @@
   'NP_HOST_TCP_HPJD' => '',
   'NP_HOST_TCP_HTTP2' => 'test.monitoring-plugins.org',
   'NP_HOST_TCP_HTTP' => 'localhost',
+  'NP_HOST_TCP_HTTP_IPV4' => '127.0.0.1',
+  'NP_HOST_TCP_HTTP_IPV4_CIDR_1' => '127.0.0.0/28',
+  'NP_HOST_TCP_HTTP_IPV4_CIDR_2' => '127.0.0.1/32',
+  'NP_HOST_TCP_HTTP_IPV6' => '::1',
+  'NP_HOST_TCP_HTTP_IPV6_CIDR_1' => '0000:0000:0000::0000:0000:0000/16',
+  'NP_HOST_TCP_HTTP_IPV6_CIDR_2' => '::1234:5678/16',
+  'NP_HOST_TCP_HTTP_SUBDOMAIN' => 'subdomain1.localhost',
   'NP_HOST_TCP_IMAP' => 'imap.web.de',
   'NP_HOST_TCP_JABBER' => 'jabber.org',
   'NP_HOST_TCP_LDAP' => 'localhost',
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index cffe98c5..15c2286c 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -67,10 +67,10 @@ apt-get -y install perl \
         libjson-perl
 
 # remove ipv6 interface from hosts
-sed '/^::1/d' /etc/hosts > /tmp/hosts
-cp -f /tmp/hosts /etc/hosts
-ip addr show
-cat /etc/hosts
+# sed '/^::1/d' /etc/hosts > /tmp/hosts
+# cp -f /tmp/hosts /etc/hosts
+# ip addr show
+# cat /etc/hosts
 
 # apache
 a2enmod ssl
@@ -80,6 +80,19 @@ 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
+cp tools/subdomain1/subdomain1.conf /etc/apache2/sites-available/
+mkdir -p /var/www/subdomain1
+cp tools/subdomain1/index.php /var/www/subdomain1/
+echo '127.0.0.1 subdomain1.localhost' >> /etc/hosts
+echo '127.0.0.1 subdomain1.localhost.com' >> /etc/hosts
+apache2ctl configtest
+a2ensite subdomain1.conf
+
+# Make it listen to both IPv4 on IPv6 on localhost
+sed -i 's/^Listen 80/Listen 0.0.0.0:80\nListen [::1]:80/' /etc/apache2/ports.conf
+sed -i 's/^[[:space:]]*Listen 443/Listen 0.0.0.0:443\nListen [::1]:443/' /etc/apache2/ports.conf
+
 service apache2 restart
 
 # squid