X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/356a507d8627f062775ea315500c3f099588b5e3..05bb009f80ade5b81274bea496cd4fb67850670c:/cookbooks/forum/recipes/default.rb

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 826310f73..c081dd3d2 100644
--- 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 "php::apache"
+include_recipe "php::fpm"
 
 cache_dir = Chef::Config[:file_cache_path]
 
@@ -43,6 +43,12 @@ ssl_certificate "forum.openstreetmap.org" do
   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
@@ -63,22 +69,22 @@ git "/srv/forum.openstreetmap.org/html/" do
   notifies :reload, "service[apache2]"
 end
 
-remote_file "#{cache_dir}/air3_v0.8.zip" do
+remote_file "#{cache_dir}/air3_v0.8.tar.gz" do
   action :create_if_missing
-  source "https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip"
+  source "https://github.com/natrius/air3/archive/refs/tags/v0.8.tar.gz"
   owner "root"
   group "root"
   mode "644"
   backup false
 end
 
-execute "#{cache_dir}/air3_v0.8.zip" do
+execute "#{cache_dir}/air3_v0.8.tar.gz" do
   action :nothing
-  command "unzip -o -qq #{cache_dir}/air3_v0.8.zip Air3.css 'Air3/*'"
+  command "tar --gunzip --extract --file=#{cache_dir}/air3_v0.8.tar.gz --strip-components=1 --wildcards air3-0.8/Air3.css 'air3-0.8/Air3/*'"
   cwd "/srv/forum.openstreetmap.org/html/style"
   user "forum"
   group "forum"
-  subscribes :run, "remote_file[#{cache_dir}/air3_v0.8.zip]", :immediately
+  subscribes :run, "remote_file[#{cache_dir}/air3_v0.8.tar.gz]", :immediately
 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do