Fetch the forum style from github instead of fluxbb.org

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 9128f73de99708fa8cef35957ba2fbea43d71155..c081dd3d2f5b24c1120ed6d2364abb3a9f57b132 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 "php::apache-fpm"
+include_recipe "php::fpm"
 
 cache_dir = Chef::Config[:file_cache_path]
 
@@ -35,6 +35,7 @@ package %w[
   unzip
 ]
 
+apache_module "env"
 apache_module "rewrite"
 
 ssl_certificate "forum.openstreetmap.org" do
@@ -42,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
@@ -49,7 +56,7 @@ end
 directory "/srv/forum.openstreetmap.org" do
   owner "forum"
   group "forum"
-  mode 0o755
+  mode "755"
 end
 
 git "/srv/forum.openstreetmap.org/html/" do
@@ -62,42 +69,41 @@ 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://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://github.com/natrius/air3/archive/refs/tags/v0.8.tar.gz"
   owner "root"
   group "root"
-  mode 0o644
+  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
   owner "www-data"
   group "www-data"
-  mode 0o755
+  mode "755"
 end
 
 directory "/srv/forum.openstreetmap.org/html/img/avatars/" do
   owner "www-data"
   group "www-data"
-  mode 0o755
+  mode "755"
 end
 
 template "/srv/forum.openstreetmap.org/html/config.php" do
   source "config.php.erb"
   owner "forum"
   group "www-data"
-  mode 0o440
+  mode "440"
   variables :passwords => passwords
 end
 
@@ -113,6 +119,6 @@ template "/etc/cron.daily/forum-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0o750
+  mode "750"
   variables :passwords => passwords
 end