Merge join and donate redirectors into supporting

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index 9ae3ebaa461ec0cf4fb2fa6950ef3119f0b078bb..49e46d78f7c8078068618daf61f0374fa626a327 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -19,83 +19,32 @@
 
 include_recipe "accounts"
 include_recipe "apache"
-include_recipe "mysql"
-include_recipe "git"
-
-package %w[
-  php
-  php-cli
-  php-curl
-  php-mysql
-  php-gd
-]
-
-apache_module "php7.2"
+include_recipe "php::fpm"
 
 apache_module "headers"
 
-passwords = data_bag_item("donate", "passwords")
-
-database_password = passwords["database"]
-
-mysql_user "donate@localhost" do
-  password database_password
-end
-
-mysql_database "donate" do
-  permissions "donate@localhost" => :all
-end
-
-directory "/srv/donate.openstreetmap.org" do
-  owner "donate"
-  group "donate"
-  mode 0o755
-end
-
-git "/srv/donate.openstreetmap.org" do
-  action :sync
-  repository "https://github.com/osmfoundation/donation-drive.git"
-  depth 1
-  user "donate"
-  group "donate"
-end
-
-directory "/srv/donate.openstreetmap.org/data" do
-  owner "donate"
-  group "donate"
-  mode 0o755
-end
-
-template "/srv/donate.openstreetmap.org/scripts/db-connect.inc.php" do
-  source "db-connect.inc.php.erb"
-  owner "root"
-  group "donate"
-  mode 0o644
-  variables :passwords => passwords
-end
-
 ssl_certificate "donate.openstreetmap.org" do
   domains ["donate.openstreetmap.org", "donate.openstreetmap.com",
            "donate.openstreetmap.net", "donate.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
+php_fpm "donate.openstreetmap.org" do
+  action :delete
+end
+
 apache_site "donate.openstreetmap.org" do
   template "apache.erb"
 end
 
-template "/etc/cron.d/osmf-donate" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0o600
-  variables :passwords => passwords
+service "osmf-donate.timer" do
+  action [:stop, :disable]
+end
+
+systemd_service "osmf-donate" do
+  action :delete
 end
 
-template "/etc/cron.daily/osmf-donate-backup" do
-  source "backup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o750
-  variables :passwords => passwords
+file "/etc/cron.daily/osmf-donate-backup" do
+  action :delete
 end