donate: fix db secret handling

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

diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index e98e5c361063cf7f961a63386c5b6800dbb99426..3fbeb19d5b92f87a2356cc1e98bbb1e076c2cc8e 100644 (file)
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -17,18 +17,30 @@
 # limitations under the License.
 #
 
+node.default[:ssl][:certificates] = node[:ssl][:certificates] | ["openstreetmap"]
+
 include_recipe "apache::ssl"
 include_recipe "mysql"
 include_recipe "git"
 
-package "php"
-package "php-cli"
-package "php-curl"
-package "php-mbstring"
-package "php-mysql"
-package "php-gd"
+if node[:lsb][:release].to_f >= 16.04
+  package "php"
+  package "php-cli"
+  package "php-curl"
+  package "php-mysql"
+  package "php-gd"
+
+  apache_module "php7.0"
+else
+  package "php5"
+  package "php5-cli"
+  package "php5-curl"
+  package "php5-mysql"
+  package "php5-gd"
+
+  apache_module "php5"
+end
 
-apache_module "php7.0"
 apache_module "headers"
 
 passwords = data_bag_item("donate", "passwords")
@@ -43,6 +55,12 @@ 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 "git://github.com/osmfoundation/donation-drive.git"
@@ -50,6 +68,19 @@ git "/srv/donate.openstreetmap.org" do
   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 0o640
+end
+
 apache_site "donate.openstreetmap.org" do
   template "apache.erb"
 end