From 2158e1d4bfb2eec21b3f4dcdeae8f90976dd795f Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 13 Dec 2019 13:14:29 +0100 Subject: [PATCH 1/4] Allow SVG file uploads --- site-cookbooks/kosmos-mediawiki/recipes/default.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index 261da2e..b1dd0b1 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -169,6 +169,7 @@ $wgGroupPermissions['team']['editsemiprotected'] = true; $wgGroupPermissions['team']['editprotected'] = true; $wgGroupPermissions['sysop']['edit'] = true; $wgEnableUploads = true; +$wgFileExtensions = [ 'png', 'gif', 'jpg', 'jpeg', 'webp', 'svg' ]; $wgExtraNamespaces[100] = "Feature"; $wgNamespacesWithSubpages[100] = true; From cbfb760787eccb2b5b03cad0814985708fa8f8b0 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 13 Dec 2019 13:38:41 +0100 Subject: [PATCH 2/4] Increase wiki file upload size limit --- .../kosmos-mediawiki/templates/default/nginx.conf.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb b/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb index 1492fb3..b99742a 100644 --- a/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb +++ b/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb @@ -12,6 +12,8 @@ server { root <%= @docroot %>; index index.php; + client_max_body_size 20M; + location / { try_files $uri $uri/ /index.php?$args; } From 2358ed00dbe85993255925620fa72f1d8ff23bd3 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 13 Dec 2019 13:40:15 +0100 Subject: [PATCH 3/4] Fix wiki permissions --- site-cookbooks/kosmos-mediawiki/recipes/default.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index b1dd0b1..fb08abf 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -160,13 +160,13 @@ ruby_block "configuration" do # Our config $wgGroupPermissions['*']['edit'] = false; $wgGroupPermissions['team'] = $wgGroupPermissions['user']; -$wgGroupPermissions['user' ]['edit'] = false; +$wgGroupPermissions['user']['edit'] = true; $wgGroupPermissions['user']['editsemiprotected'] = false; $wgGroupPermissions['autoconfirmed']['editsemiprotected'] = false; -$wgGroupPermissions['team']['edit'] = true; -$wgGroupPermissions['team']['protect'] = true; -$wgGroupPermissions['team']['editsemiprotected'] = true; -$wgGroupPermissions['team']['editprotected'] = true; +$wgGroupPermissions['team']['edit'] = true; +$wgGroupPermissions['team']['protect'] = true; +$wgGroupPermissions['team']['editsemiprotected'] = true; +$wgGroupPermissions['team']['editprotected'] = true; $wgGroupPermissions['sysop']['edit'] = true; $wgEnableUploads = true; $wgFileExtensions = [ 'png', 'gif', 'jpg', 'jpeg', 'webp', 'svg' ]; From 11c7019bfa451ef3bc16fad68c4724e16bed5c17 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 13 Dec 2019 13:46:57 +0100 Subject: [PATCH 4/4] Fix thumbnails not working for larger SVGs See linked docs in code comments --- site-cookbooks/kosmos-mediawiki/recipes/default.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index fb08abf..09331c6 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -170,6 +170,10 @@ $wgGroupPermissions['team']['editprotected'] = true; $wgGroupPermissions['sysop']['edit'] = true; $wgEnableUploads = true; $wgFileExtensions = [ 'png', 'gif', 'jpg', 'jpeg', 'webp', 'svg' ]; +// Parse large SVGs, so they can be thumbnailed without errors +// https://phabricator.wikimedia.org/T199737 +// https://www.mediawiki.org/wiki/Manual:$wgSVGMetadataCutoff +$wgSVGMetadataCutoff = 20000000; // 20 MB $wgExtraNamespaces[100] = "Feature"; $wgNamespacesWithSubpages[100] = true;