Allow overwrite when updating forum style

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 73698638805f8be4f6b7ba8eeca59152e8b746f5..22015e68a48ee996826cedef81f19b797675c0cf 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 "php5"
-package "php5-cli"
-package "php5-mysql"
-package "php-apc"
+package %w[
+  php
+  php-cli
+  php-mysql
+  php-xml
+  php-apcu
+]

 
 

-apache_module "php5"
+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


@@ -40,28 +45,55 @@ end
 directory "/srv/forum.openstreetmap.org" do
   owner "forum"
   group "forum"
 directory "/srv/forum.openstreetmap.org" do
   owner "forum"
   group "forum"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/forum.openstreetmap.org/html/" do
   action :sync
 end
 
 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
+
+remote_file "/var/cache/chef/air3_v0.8.zip" do
+  action :create_if_missing
+  source "https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip"
+  owner "root"
+  group "root"
+  mode 0o644
+  backup false
+end
+
+execute "/var/cache/chef/air3_v0.8.zip" do
+  action :nothing
+  command "unzip -o -qq /var/cache/chef/air3_v0.8.zip Air3.css Air3/*"
+  cwd "/srv/forum.openstreetmap.org/html/style"
+  user "forum"
+  group "forum"
+  subscribes :run, "remote_file[/var/cache/chef/air3_v0.8.zip]", :immediately

 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do
   owner "www-data"
   group "www-data"
 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do
   owner "www-data"
   group "www-data"

-  mode 0755
+  mode 0o755

 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 0755
+  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
 end
 
 mysql_user "forum@localhost" do


@@ -76,6 +108,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 0750
+  mode 0o750

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