Make sure the planet user is created by recipes which use it

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 64f7cd5de2e8a512db1faee11bd3f3755763b405..7054ec14a687ee766406eb67072fe9cc81bb0b0d 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: foundation
+# Cookbook:: foundation

 # Recipe:: owg
 #
 # Recipe:: owg
 #

-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,53 +17,9 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache"
-include_recipe "git"
+include_recipe "podman::apache"

 
 

-package %w[
-  ruby
-  ruby-dev
-]
-
-gem_package "bundler"
-
-git "/srv/operations.osmfoundation.org" do
-  action :sync
-  repository "git://github.com/openstreetmap/owg-website.git"
-  user "root"
-  group "root"
-  notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"
-end
-
-directory "/srv/operations.osmfoundation.org/_site" do
-  mode 0o755
-  owner "nobody"
-  group "nogroup"
-end
-
-execute "/srv/operations.osmfoundation.org/Gemfile" do
-  action :nothing
-  command "bundle install"
-  cwd "/srv/operations.osmfoundation.org"
-  user "root"
-  group "root"
-  notifies :run, "execute[/srv/operations.osmfoundation.org]"
-end
-
-execute "/srv/operations.osmfoundation.org" do
-  action :nothing
-  command "bundle exec jekyll build --trace --baseurl=https://operations.osmfoundation.org"
-  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"
+podman_site "operations.osmfoundation.org" do
+  image "ghcr.io/openstreetmap/owg-website:latest"
+  aliases ["operations.openstreetmap.org", "operations.osm.org"]

 end
 end