From 8d35fae001a3d6dcaf66bf467d07dbad1f5ed1c6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 17 Nov 2025 22:41:39 +0000 Subject: [PATCH] Fix logo for foundation wiki --- .../foundation/files/default/osm_logo.svg | 323 ++++++++++++++++++ cookbooks/foundation/recipes/wiki.rb | 4 +- .../templates/default/LocalSettings.php.erb | 2 +- 3 files changed, 326 insertions(+), 3 deletions(-) create mode 100644 cookbooks/foundation/files/default/osm_logo.svg diff --git a/cookbooks/foundation/files/default/osm_logo.svg b/cookbooks/foundation/files/default/osm_logo.svg new file mode 100644 index 000000000..4189d70e7 --- /dev/null +++ b/cookbooks/foundation/files/default/osm_logo.svg @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb index 05fff35bd..23a6686da 100644 --- a/cookbooks/foundation/recipes/wiki.rb +++ b/cookbooks/foundation/recipes/wiki.rb @@ -37,7 +37,7 @@ mediawiki_site "osmfoundation.org" do database_password passwords["wiki"]["database"] admin_password passwords["wiki"]["admin"] skin "vector-2022" - logo "/w/skins/OSMFoundation/img/logo.png" + logo "/osm_logo.svg" email_contact "webmaster@openstreetmap.org" email_sender "wiki@noreply.openstreetmap.org" email_sender_name "OSMF Wiki" @@ -59,7 +59,7 @@ mediawiki_extension "Scribunto" do template_cookbook "foundation" end -cookbook_file "/srv/osmfoundation.org/Wiki.png" do +cookbook_file "/srv/osmfoundation.org/osm_logo.svg" do owner node[:mediawiki][:user] group node[:mediawiki][:group] mode "644" diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb index 35db7dbfe..44e21be3e 100644 --- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb +++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb @@ -38,7 +38,7 @@ $wgStylePath = "$wgScriptPath/skins"; ## or else you'll overwrite your logo when you upgrade! $wgLogo = "<%= @mediawiki[:logo] %>"; $wgLogos = [ - "1x" => "<%= @mediawiki[:logo] %>" + "icon" => "<%= @mediawiki[:logo] %>" ]; ## UPO means: this is also a user preference option -- 2.39.5