supybot: more aggressive init stop

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index c5ab30ebe6f868ab62fdfb36b433e5e076858210..b354a335aa5bf578ba72b6cdc50729a7ec2a24af 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["openstreetmap"]
+

 include_recipe "apache::ssl"
 include_recipe "mysql"
 include_recipe "git"
 include_recipe "apache::ssl"
 include_recipe "mysql"
 include_recipe "git"


@@ -24,6 +26,7 @@ include_recipe "git"
 if node[:lsb][:release].to_f >= 16.04
   package "php"
   package "php-cli"
 if node[:lsb][:release].to_f >= 16.04
   package "php"
   package "php-cli"

+  package "php-curl"

   package "php-mysql"
   package "php-gd"
 
   package "php-mysql"
   package "php-gd"
 


@@ -31,6 +34,7 @@ if node[:lsb][:release].to_f >= 16.04
 else
   package "php5"
   package "php5-cli"
 else
   package "php5"
   package "php5-cli"

+  package "php5-curl"

   package "php5-mysql"
   package "php5-gd"
 
   package "php5-mysql"
   package "php5-gd"
 


@@ -51,6 +55,12 @@ mysql_database "donate" do
   permissions "donate@localhost" => :all
 end
 
   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 "git://github.com/osmfoundation/donation-drive.git"
 git "/srv/donate.openstreetmap.org" do
   action :sync
   repository "git://github.com/osmfoundation/donation-drive.git"


@@ -58,6 +68,20 @@ git "/srv/donate.openstreetmap.org" do
   group "donate"
 end
 
   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
+

 apache_site "donate.openstreetmap.org" do
   template "apache.erb"
 end
 apache_site "donate.openstreetmap.org" do
   template "apache.erb"
 end