Configure eddie as a database master

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

diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index d7a103fd3a5b0b52e058925593d17578d762fc55..97051e1a13467b77d1578fe54e959247e9c1b7b7 100644 (file)
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -17,15 +17,13 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
-package "ruby2.0"
-package "ruby2.0-dev"
+package "ruby"
+package "ruby-dev"
 
-gem_package "jekyll" do
-  gem_binary "gem2.0"
-end
+gem_package "jekyll"
 
 git "/srv/hardware.openstreetmap.org" do
   action :sync
@@ -40,7 +38,7 @@ roles = { :rows => search(:role, "*:*") }
 
 file "/srv/hardware.openstreetmap.org/_data/nodes.json" do
   content nodes.to_json
-  mode 0644
+  mode 0o644
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
@@ -48,14 +46,14 @@ end
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json
-  mode 0644
+  mode 0o644
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
 end
 
 directory "/srv/hardware.openstreetmap.org/_site" do
-  mode 0755
+  mode 0o755
   owner "nobody"
   group "nogroup"
 end
@@ -68,6 +66,11 @@ execute "/srv/hardware.openstreetmap.org" do
   group "nogroup"
 end
 
+ssl_certificate "hardware.openstreetmap.org" do
+  domains "hardware.openstreetmap.org"
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "hardware.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/hardware.openstreetmap.org/_site"