nominatim: add new dependency for updated osm2pgsql

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index b60d02bac284c6394c02391ccb9ea19c59a1de1a..7054ec14a687ee766406eb67072fe9cc81bb0b0d 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -17,64 +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
-  zlib1g-dev
-]
-
-gem_package "bundler" do
-  version "1.17.3"
-end
-
-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
-
-# Workaround https://github.com/jekyll/jekyll/issues/7804
-# by creating a .jekyll-cache folder
-directory "/srv/operations.osmfoundation.org/.jekyll-cache" do
-  mode 0o755
-  owner "nobody"
-  group "nogroup"
-end
-
-execute "/srv/operations.osmfoundation.org/Gemfile" do
-  action :nothing
-  command "bundle install --deployment"
-  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