Merge remote-tracking branch 'github/pull/578'

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

diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index 5b2703fee4b9166ef27b9d9846811f686a4718c4..78ca5ea6b9cef5294325b82ebf1d94cd1ab90813 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,64 +17,26 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 
 

-passwords = data_bag_item("switch2osm", "passwords")
+docker_external_port = 8093

 
 

-wordpress_site "switch2osm.org" do
-  aliases ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]
-  directory "/srv/switch2osm.org"
-  ssl_enabled true
-  database_name "switch2osm-blog"
-  database_user "switch2osm-user"
-  database_password passwords["switch2osm-user"]
+podman_service "switch2osm.org" do
+  description "Container service for switch2osm.org"
+  image "ghcr.io/switch2osm/switch2osm:latest"
+  ports docker_external_port => "8080"

 end
 
 end
 

-wordpress_theme "picolight" do
-  site "switch2osm.org"
-  repository "git://github.com/Firefishy/picolight-s2o.git"
-  revision "master"
+ssl_certificate "switch2osm.org" do
+  domains ["switch2osm.org",
+           "www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]
+  notifies :reload, "service[apache2]"

 end
 
 end
 

-wordpress_plugin "sitepress-multilingual-cms" do
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/sitepress-multilingual-cms.git"
-end
-
-wordpress_plugin "wpml-cms-nav" do
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-cms-nav.git"
-end
-
-wordpress_plugin "wpml-sticky-links" do
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-sticky-links.git"
-end
-
-wordpress_plugin "wpml-string-translation" do
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-string-translation.git"
-end
-
-wordpress_plugin "wpml-translation-analytics" do
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-translation-analytics.git"
-end
-
-wordpress_plugin "wpml-translation-management" do
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-translation-management.git"
-end
-
-wordpress_plugin "wpml-xliff" do
-  site "switch2osm.org"
-  repository "git://chef.openstreetmap.org/wpml-xliff.git"
-end
+apache_module "proxy_http"

 
 

-template "/etc/cron.daily/switch2osm-backup" do
-  source "backup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0750
-  variables :passwords => passwords
+apache_site "switch2osm.org" do
+  template "apache.erb"
+  variables :docker_external_port => docker_external_port, :aliases => ["www.switch2osm.org", "switch2osm.com", "www.switch2osm.com"]

 end
 end