Merge branch 'master' into feature/145-sockethub_from_npm

2021-07-09 10:51:02 +02:00
parent 43736cd8e9 7fc0a65a22
commit b8ac5e1c07
465 changed files with 13043 additions and 6361 deletions
--- a/site-cookbooks/sockethub/recipes/_firewall.rb
+++ b/site-cookbooks/sockethub/recipes/_firewall.rb
@@ -25,7 +25,8 @@
 # THE SOFTWARE.

 unless node.chef_environment == "development"
-  include_recipe "firewall"
+  include_recipe "kosmos-base::firewall"
+
  firewall_rule 'sockethub' do
    port     node['sockethub']['external_port'].to_i
    protocol :tcp