community: Fix tests and workaround ohai issue on ARM Mac

[chef.git] / cookbooks / community / recipes / default.rb

diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb
index 89743de31c0fb7a7de419922633b6bd61b2ed693..f3888c61a43324edc29491c0409fc6bfc7a409fe 100644 (file)
--- a/cookbooks/community/recipes/default.rb
+++ b/cookbooks/community/recipes/default.rb
@@ -19,13 +19,17 @@
 
 include_recipe "accounts"
 include_recipe "docker"
-include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "ssl"
 
 passwords = data_bag_item("community", "passwords")
 license_keys = data_bag_item("geoipupdate", "license-keys") unless kitchen?
 
+# Disable any default installed apache2 service. Web server is embedded within the discourse docker container
+service "apache2" do
+  action [:disable, :stop]
+end
+
 directory "/srv/community.openstreetmap.org" do
   owner "root"
   group "root"