From: Tom Hughes <tom@compton.nu>
Date: Tue, 21 Mar 2023 18:47:53 +0000 (+0000)
Subject: Expect apache to listen on tcp6 instead of tcp
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/81483a4189dea452f6ec9d9266c91c490e12f3be?ds=inline

Expect apache to listen on tcp6 instead of tcp
---

diff --git a/test/integration/apache/serverspec/apache_spec.rb b/test/integration/apache/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/apache/serverspec/apache_spec.rb
+++ b/test/integration/apache/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/blog/serverspec/apache_spec.rb b/test/integration/blog/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/blog/serverspec/apache_spec.rb
+++ b/test/integration/blog/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/blogs/serverspec/apache_spec.rb b/test/integration/blogs/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/blogs/serverspec/apache_spec.rb
+++ b/test/integration/blogs/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/civicrm/serverspec/apache_spec.rb b/test/integration/civicrm/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/civicrm/serverspec/apache_spec.rb
+++ b/test/integration/civicrm/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/dmca/serverspec/apache_spec.rb b/test/integration/dmca/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/dmca/serverspec/apache_spec.rb
+++ b/test/integration/dmca/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/dns/serverspec/apache_spec.rb b/test/integration/dns/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/dns/serverspec/apache_spec.rb
+++ b/test/integration/dns/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/donate/serverspec/apache_spec.rb b/test/integration/donate/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/donate/serverspec/apache_spec.rb
+++ b/test/integration/donate/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/forum/serverspec/apache_spec.rb b/test/integration/forum/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/forum/serverspec/apache_spec.rb
+++ b/test/integration/forum/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/foundation-board/serverspec/apache_spec.rb b/test/integration/foundation-board/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/foundation-board/serverspec/apache_spec.rb
+++ b/test/integration/foundation-board/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/foundation-dwg/serverspec/apache_spec.rb b/test/integration/foundation-dwg/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/foundation-dwg/serverspec/apache_spec.rb
+++ b/test/integration/foundation-dwg/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/foundation-mwg/serverspec/apache_spec.rb b/test/integration/foundation-mwg/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/foundation-mwg/serverspec/apache_spec.rb
+++ b/test/integration/foundation-mwg/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/foundation-owg/serverspec/apache_spec.rb b/test/integration/foundation-owg/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/foundation-owg/serverspec/apache_spec.rb
+++ b/test/integration/foundation-owg/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/foundation-welcome/serverspec/apache_spec.rb b/test/integration/foundation-welcome/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/foundation-welcome/serverspec/apache_spec.rb
+++ b/test/integration/foundation-welcome/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/foundation-wiki/serverspec/apache_spec.rb b/test/integration/foundation-wiki/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/foundation-wiki/serverspec/apache_spec.rb
+++ b/test/integration/foundation-wiki/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/git-web/serverspec/apache_spec.rb b/test/integration/git-web/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/git-web/serverspec/apache_spec.rb
+++ b/test/integration/git-web/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/gps-tile/serverspec/apache_spec.rb b/test/integration/gps-tile/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/gps-tile/serverspec/apache_spec.rb
+++ b/test/integration/gps-tile/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/hot/serverspec/apache_spec.rb b/test/integration/hot/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/hot/serverspec/apache_spec.rb
+++ b/test/integration/hot/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/irc/serverspec/apache_spec.rb b/test/integration/irc/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/irc/serverspec/apache_spec.rb
+++ b/test/integration/irc/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/kibana/serverspec/apache_spec.rb b/test/integration/kibana/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/kibana/serverspec/apache_spec.rb
+++ b/test/integration/kibana/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/mailman/serverspec/apache_spec.rb b/test/integration/mailman/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/mailman/serverspec/apache_spec.rb
+++ b/test/integration/mailman/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/matomo/serverspec/apache_spec.rb b/test/integration/matomo/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/matomo/serverspec/apache_spec.rb
+++ b/test/integration/matomo/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/munin-server/serverspec/apache_spec.rb b/test/integration/munin-server/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/munin-server/serverspec/apache_spec.rb
+++ b/test/integration/munin-server/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/osqa/serverspec/apache_spec.rb b/test/integration/osqa/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/osqa/serverspec/apache_spec.rb
+++ b/test/integration/osqa/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/otrs/serverspec/apache_spec.rb b/test/integration/otrs/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/otrs/serverspec/apache_spec.rb
+++ b/test/integration/otrs/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/overpass/serverspec/apache_spec.rb b/test/integration/overpass/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/overpass/serverspec/apache_spec.rb
+++ b/test/integration/overpass/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/php-apache/serverspec/apache_spec.rb b/test/integration/php-apache/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/php-apache/serverspec/apache_spec.rb
+++ b/test/integration/php-apache/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/planet/serverspec/apache_spec.rb b/test/integration/planet/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/planet/serverspec/apache_spec.rb
+++ b/test/integration/planet/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/prometheus-server/serverspec/apache_spec.rb b/test/integration/prometheus-server/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/prometheus-server/serverspec/apache_spec.rb
+++ b/test/integration/prometheus-server/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/serverinfo/serverspec/apache_spec.rb b/test/integration/serverinfo/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/serverinfo/serverspec/apache_spec.rb
+++ b/test/integration/serverinfo/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/stateofthemap-container/serverspec/apache_spec.rb b/test/integration/stateofthemap-container/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/stateofthemap-container/serverspec/apache_spec.rb
+++ b/test/integration/stateofthemap-container/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/stateofthemap-wordpress/serverspec/apache_spec.rb b/test/integration/stateofthemap-wordpress/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/stateofthemap-wordpress/serverspec/apache_spec.rb
+++ b/test/integration/stateofthemap-wordpress/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/subversion/serverspec/apache_spec.rb b/test/integration/subversion/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/subversion/serverspec/apache_spec.rb
+++ b/test/integration/subversion/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/switch2osm/serverspec/apache_spec.rb b/test/integration/switch2osm/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/switch2osm/serverspec/apache_spec.rb
+++ b/test/integration/switch2osm/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/taginfo/serverspec/apache_spec.rb b/test/integration/taginfo/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/taginfo/serverspec/apache_spec.rb
+++ b/test/integration/taginfo/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/tile/serverspec/apache_spec.rb b/test/integration/tile/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/tile/serverspec/apache_spec.rb
+++ b/test/integration/tile/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/trac/serverspec/apache_spec.rb b/test/integration/trac/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/trac/serverspec/apache_spec.rb
+++ b/test/integration/trac/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/web-frontend/serverspec/apache_spec.rb b/test/integration/web-frontend/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/web-frontend/serverspec/apache_spec.rb
+++ b/test/integration/web-frontend/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/web-rails/serverspec/apache_spec.rb b/test/integration/web-rails/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/web-rails/serverspec/apache_spec.rb
+++ b/test/integration/web-rails/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/wiki/serverspec/apache_spec.rb b/test/integration/wiki/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/wiki/serverspec/apache_spec.rb
+++ b/test/integration/wiki/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
diff --git a/test/integration/wordpress/serverspec/apache_spec.rb b/test/integration/wordpress/serverspec/apache_spec.rb
index 446d3b915..dcd625ae5 100644
--- a/test/integration/wordpress/serverspec/apache_spec.rb
+++ b/test/integration/wordpress/serverspec/apache_spec.rb
@@ -13,9 +13,9 @@ describe service("apache2") do
 end
 
 describe port(80) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end
 
 describe port(443) do
-  it { should be_listening.with("tcp") }
+  it { should be_listening.with("tcp6") }
 end