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

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

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

-# 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,71 +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
+podman_site "switch2osm.org" do
+  image "ghcr.io/switch2osm/switch2osm:latest"

   aliases ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]
   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 "switch2osm.org-picolight" do
-  theme "picolight"
-  site "switch2osm.org"
-  repository "git://github.com/Firefishy/picolight-s2o.git"
-  revision "master"
-end
-
-wordpress_plugin "switch2osm.org-sitepress-multilingual-cms" do
-  plugin "sitepress-multilingual-cms"
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
-end
-
-wordpress_plugin "switch2osm.org-wpml-cms-nav" do
-  plugin "wpml-cms-nav"
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-cms-nav.git"
-end
-
-wordpress_plugin "switch2osm.org-wpml-sticky-links" do
-  plugin "wpml-sticky-links"
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-sticky-links.git"
-end
-
-wordpress_plugin "switch2osm.org-wpml-string-translation" do
-  plugin "wpml-string-translation"
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-string-translation.git"
-end
-
-wordpress_plugin "switch2osm.org-wpml-translation-analytics" do
-  plugin "wpml-translation-analytics"
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-translation-analytics.git"
-end
-
-wordpress_plugin "switch2osm.org-wpml-translation-management" do
-  plugin "wpml-translation-management"
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-translation-management.git"
-end
-
-wordpress_plugin "switch2osm.org-wpml-xliff" do
-  plugin "wpml-xliff"
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-xliff.git"
-end
-
-template "/etc/cron.daily/switch2osm-backup" do
-  source "backup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o750
-  variables :passwords => passwords

 end
 end