Re-enable wikdiff2

[chef.git] / cookbooks / foundation / recipes / owg.rb

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index f71bd1fa72e74e8573f8936bb74748fd6cfa8fdd..d0dd92a843b4e4d2a2222d90b309053cb665c767 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -17,18 +17,17 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 include_recipe "git"
 
 package "ruby"
 package "ruby-dev"
 
 include_recipe "git"
 
 package "ruby"
 package "ruby-dev"
 

-gem_package "jekyll"

 gem_package "bundler"
 
 git "/srv/operations.osmfoundation.org" do
   action :sync
 gem_package "bundler"
 
 git "/srv/operations.osmfoundation.org" do
   action :sync

-  repository "git://github.com/gravitystorm/owg-log.git"
+  repository "git://github.com/openstreetmap/owg-website.git"

   user "root"
   group "root"
   notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"
   user "root"
   group "root"
   notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"


@@ -51,12 +50,17 @@ end
 
 execute "/srv/operations.osmfoundation.org" do
   action :nothing
 
 execute "/srv/operations.osmfoundation.org" do
   action :nothing

-  command "jekyll build --trace"
+  command "bundle exec jekyll build --trace --baseurl=https://operations.osmfoundation.org"

   cwd "/srv/operations.osmfoundation.org"
   user "nobody"
   group "nogroup"
 end
 
   cwd "/srv/operations.osmfoundation.org"
   user "nobody"
   group "nogroup"
 end
 

+ssl_certificate "operations.osmfoundation.org" do
+  domains "operations.osmfoundation.org"
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "operations.osmfoundation.org" do
   template "apache.owg.erb"
   directory "/srv/operations.osmfoundation.org/_site"
 apache_site "operations.osmfoundation.org" do
   template "apache.owg.erb"
   directory "/srv/operations.osmfoundation.org/_site"