Make munin use the node name instead of the FQDN

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 58daae4221ea0d222deb4649924cf4a7c1684474..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,


@@ -17,10 +17,79 @@
 # limitations under the License.
 #
 include_recipe "apache"
 # limitations under the License.
 #
 include_recipe "apache"

+include_recipe "git"
+include_recipe "mysql"

 
 

-package "php5"
-package "php5-cli"
-package "php-apc"
+passwords = data_bag_item("forum", "passwords")

 
 

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

 
 

+apache_module "php7.2"
+apache_module "rewrite"
+
+ssl_certificate "forum.openstreetmap.org" do
+  domains ["forum.openstreetmap.org", "forum.osm.org"]
+  notifies :reload, "service[apache2]"
+end
+
+apache_site "forum.openstreetmap.org" do
+  template "apache.erb"
+end
+
+directory "/srv/forum.openstreetmap.org" do
+  owner "forum"
+  group "forum"
+  mode 0o755
+end
+
+git "/srv/forum.openstreetmap.org/html/" do
+  action :sync
+  repository "http://github.com/openstreetmap/openstreetmap-forum.git"
+  revision "openstreetmap-1.5.10"
+  depth 1
+  user "forum"
+  group "forum"
+  notifies :reload, "service[apache2]"
+end
+
+directory "/srv/forum.openstreetmap.org/html/cache/" do
+  owner "www-data"
+  group "www-data"
+  mode 0o755
+end
+
+directory "/srv/forum.openstreetmap.org/html/img/avatars/" do
+  owner "www-data"
+  group "www-data"
+  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_database "forum" do
+  permissions "forum@localhost" => :all
+end
+
+template "/etc/cron.daily/forum-backup" do
+  source "backup.cron.erb"
+  owner "root"
+  group "root"
+  mode 0o750
+  variables :passwords => passwords
+end