Don't escape wildcard prefixes during backup expiry

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index d394d7e580b1225d3e62f2be7bf0bc0c10d5c720..d4eb9eeecdeb0b30224f36311e9a03642ea14b6c 100644 (file)
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: switch2osm
+# Cookbook:: switch2osm

 # Recipe:: default
 #
 # Recipe:: default
 #

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

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

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


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

-include_recipe "wordpress"
+include_recipe "podman::apache"

 
 

-passwords = data_bag_item("switch2osm", "passwords")
-
-wordpress_site "switch2osm.org" do
-  aliases "www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"
-  directory "/srv/switch2osm.org"
-  database_name "switch2osm-blog"
-  database_user "switch2osm-user"
-  database_password passwords["switch2osm-user"]
-end
-
-wordpress_theme "picolight" do
-  site "switch2osm.org"
-  repository "git://github.com/Firefishy/picolight-s2o.git"
-  revision "master"
+podman_site "switch2osm.org" do
+  image "ghcr.io/switch2osm/switch2osm:latest"
+  aliases ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]

 end
 end