# limitations under the License.
#
-#include_recipe "squid"
+# include_recipe "squid"
include_recipe "mediawiki"
passwords = data_bag_item("wiki", "passwords")
apache_site "default" do
- action [ :disable ]
+ action [:disable]
end
-mediawiki_site "wiki.openstreetmap.org" do
- aliases "wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net", "wiki.openstreetmap.ca", "wiki.openstreetmap.eu", "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"
- directory "/srv/wiki.openstreetmap.org"
+mediawiki_site "wiki.openstreetmap.org" do
+ aliases ["wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net",
+ "wiki.openstreetmap.ca", "wiki.openstreetmap.eu",
+ "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"]
+ directory "/srv/wiki.openstreetmap.org"
+
+ ssl_enabled TRUE
- enable_ssl TRUE
-
database_name "wiki"
- database_username "wiki-user"
+ database_user "wiki-user"
database_password passwords["database"]
admin_password passwords["admin"]
- logo "/osm_logo_wiki.png"
+ logo "/osm_logo_wiki.png"
email_contact "webmaster@openstreetmap.org"
- email_sender "wiki@openstreetmap.org"
+ email_sender "wiki@openstreetmap.org"
email_sender_name "OpenStreetMap Wiki"
metanamespace "OpenStreetMap"
- recaptcha_public_key "6Lc9OLsSAAAAAKazGuA9zItboXIHb6ObYOdiVm6o"
- recaptcha_private_key "6Lc9OLsSAAAAAKVZr9jFBc0GL-9Fm2H-paqu-4TB"
-
- #site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8:00am UTC/GMT."
+ recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
+ recaptcha_private_key passwords["recaptcha"]
+ # site_readonly "MAINTENANCE UPDATE: WIKI READ-ONLY. ETA: Tuesday 8:00am UTC/GMT."
end
cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
end
apache_site "dump.wiki.openstreetmap.org" do
- template "apache_wiki_dump.erb"
+ template "apache_wiki_dump.erb"
directory "/srv/dump.wiki.openstreetmap.org"
- variables({
- :aliases => "dump.wiki.osm.org"
- })
+ variables :aliases => "dump.wiki.osm.org"
end
template "/etc/cron.d/wiki-osm-org-dump" do
mode 0644
source "cron_wiki_dump.erb"
end
-