Add reverse DNS for internal hosts at Equinix Dublin

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 798c778d17581be933bf934150116315234ff993..728408a0c8d7e91e2be06398fba86a4ed0a67ada 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -21,7 +21,7 @@ include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
 include_recipe "mysql"
 include_recipe "apache"
 include_recipe "git"
 include_recipe "mysql"

-include_recipe "php::apache"
+include_recipe "php::fpm"

 
 cache_dir = Chef::Config[:file_cache_path]
 
 
 cache_dir = Chef::Config[:file_cache_path]
 


@@ -43,6 +43,12 @@ ssl_certificate "forum.openstreetmap.org" do
   notifies :reload, "service[apache2]"
 end
 
   notifies :reload, "service[apache2]"
 end
 

+php_fpm "forum.openstreetmap.org" do
+  php_admin_values "open_basedir" => "/srv/forum.openstreetmap.org/html/:/usr/share/php/:/tmp/",
+                   "disable_functions" => "exec,shell_exec,system,passthru,popen,proc_open"
+  prometheus_port 9253
+end
+

 apache_site "forum.openstreetmap.org" do
   template "apache.erb"
 end
 apache_site "forum.openstreetmap.org" do
   template "apache.erb"
 end


@@ -65,8 +71,7 @@ end
 
 remote_file "#{cache_dir}/air3_v0.8.zip" do
   action :create_if_missing
 
 remote_file "#{cache_dir}/air3_v0.8.zip" do
   action :create_if_missing

-  source "https://grant.dev.openstreetmap.org/forum/air3_v0.8.zip" # Workaround OpenSSL chain of trust bug in chef https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip
-  checksum "df547e3ac9596c1e6d9eedcb108559f84a28669763e24114ca6cdcbf118caf6c"
+  source "https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip"

   owner "root"
   group "root"
   mode "644"
   owner "root"
   group "root"
   mode "644"