X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7a3a01f710421e67b96dfebd5a51c4374be73035..218b774fc17db5e043c567fc5a0bc469a48bbcd8:/cookbooks/switch2osm/recipes/default.rb diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb index 96593bfeb..d4eb9eeec 100644 --- a/cookbooks/switch2osm/recipes/default.rb +++ b/cookbooks/switch2osm/recipes/default.rb @@ -16,73 +16,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -include_recipe "apache" -include_recipe "git" -package %w[ - ruby - ruby-dev - zlib1g-dev -] +include_recipe "podman::apache" -gem_package "bundler" do - version "1.17.3" -end - -git "/srv/switch2osm.org" do - action :sync - repository "https://github.com/switch2osm/switch2osm.github.io.git" - user "root" - group "root" - notifies :run, "execute[/srv/switch2osm.org/Gemfile]" -end - -directory "/srv/switch2osm.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/switch2osm.org/.jekyll-cache" do - mode 0o755 - owner "nobody" - group "nogroup" -end - -execute "/srv/switch2osm.org/Gemfile" do - action :nothing - command "bundle install --deployment" - cwd "/srv/switch2osm.org" - user "root" - group "root" - notifies :run, "execute[/srv/switch2osm.org]" -end - -# Temporary workaround until merged: https://github.com/switch2osm/switch2osm.github.io/pull/68 -file "/srv/switch2osm.org/_config_osm.yml" do - mode 0o644 - user "root" - group "root" - content "url: https://switch2osm.org" -end - -execute "/srv/switch2osm.org" do - action :nothing - command "bundle exec jekyll build --trace --config _config.yml,_config_osm.yml" - cwd "/srv/switch2osm.org" - user "nobody" - group "nogroup" -end - -ssl_certificate "switch2osm.org" do - domains ["switch2osm.org", - "www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"] - notifies :reload, "service[apache2]" -end - -apache_site "switch2osm.org" do - template "apache.erb" - directory "/srv/switch2osm.org/_site" +podman_site "switch2osm.org" do + image "ghcr.io/switch2osm/switch2osm:latest" + aliases ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"] end