Update CiviCRM extensions to latest versions

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index d21fd25346110d460ff6cb1934c2db80618e9880..3e2b97d8e0c0dfe5b034240d72a29d13cf4d0ab8 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -16,21 +16,26 @@
 # 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 "apache::ssl"
+include_recipe "apache"

 include_recipe "git"
 include_recipe "mysql"
 
 passwords = data_bag_item("forum", "passwords")
 
 include_recipe "git"
 include_recipe "mysql"
 
 passwords = data_bag_item("forum", "passwords")
 

-package "php"
-package "php-cli"
-package "php-mysql"
-package "php-apcu"
+package %w[
+  php
+  php-cli
+  php-mysql
+  php-xml
+  php-apcu
+]

 
 

-apache_module "php7.0"
+apache_module "php7.2"
+apache_module "rewrite"

 
 

-apache_site "default" do
-  action [:disable]
+ssl_certificate "forum.openstreetmap.org" do
+  domains ["forum.openstreetmap.org", "forum.osm.org"]
+  notifies :reload, "service[apache2]"

 end
 
 apache_site "forum.openstreetmap.org" do
 end
 
 apache_site "forum.openstreetmap.org" do


@@ -45,11 +50,12 @@ end
 
 git "/srv/forum.openstreetmap.org/html/" do
   action :sync
 
 git "/srv/forum.openstreetmap.org/html/" do
   action :sync

-  repository "http://github.com/fluxbb/fluxbb.git"
-  revision "refs/tags/fluxbb-1.5.6"
+  repository "http://github.com/openstreetmap/openstreetmap-forum.git"
+  revision "openstreetmap-1.5.10"

   depth 1
   user "forum"
   group "forum"
   depth 1
   user "forum"
   group "forum"

+  notifies :reload, "service[apache2]"

 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do
 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do


@@ -64,6 +70,14 @@ directory "/srv/forum.openstreetmap.org/html/img/avatars/" do
   mode 0o755
 end
 
   mode 0o755
 end
 

+template "/srv/forum.openstreetmap.org/html/config.php" do
+  source "config.php.erb"
+  owner "forum"
+  group "www-data"
+  mode 0o440
+  variables :passwords => passwords
+end
+

 mysql_user "forum@localhost" do
   password passwords["database"]
 end
 mysql_user "forum@localhost" do
   password passwords["database"]
 end