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 fcbf2f3305485014e688619c3d3c66c71456daf7..728408a0c8d7e91e2be06398fba86a4ed0a67ada 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -16,16 +16,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #

+
+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "git"
 include_recipe "mysql"
 include_recipe "apache"
 include_recipe "git"
 include_recipe "mysql"

+include_recipe "php::fpm"

 
 cache_dir = Chef::Config[:file_cache_path]
 
 passwords = data_bag_item("forum", "passwords")
 
 package %w[
 
 cache_dir = Chef::Config[:file_cache_path]
 
 passwords = data_bag_item("forum", "passwords")
 
 package %w[

-  php

   php-cli
   php-mysql
   php-xml
   php-cli
   php-mysql
   php-xml


@@ -33,7 +35,7 @@ package %w[
   unzip
 ]
 
   unzip
 ]
 

-apache_module "php7.2"
+apache_module "env"

 apache_module "rewrite"
 
 ssl_certificate "forum.openstreetmap.org" do
 apache_module "rewrite"
 
 ssl_certificate "forum.openstreetmap.org" do


@@ -41,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


@@ -48,7 +56,7 @@ end
 directory "/srv/forum.openstreetmap.org" do
   owner "forum"
   group "forum"
 directory "/srv/forum.openstreetmap.org" do
   owner "forum"
   group "forum"

-  mode 0o755
+  mode "755"

 end
 
 git "/srv/forum.openstreetmap.org/html/" do
 end
 
 git "/srv/forum.openstreetmap.org/html/" do


@@ -66,7 +74,7 @@ remote_file "#{cache_dir}/air3_v0.8.zip" do
   source "https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip"
   owner "root"
   group "root"
   source "https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   backup false
 end
 
   backup false
 end
 


@@ -82,20 +90,20 @@ end
 directory "/srv/forum.openstreetmap.org/html/cache/" do
   owner "www-data"
   group "www-data"
 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"
 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"
 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
 
   variables :passwords => passwords
 end
 


@@ -111,6 +119,6 @@ template "/etc/cron.daily/forum-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0o750
+  mode "750"

   variables :passwords => passwords
 end
   variables :passwords => passwords
 end