From 5d19eacf95f4994c81e1d4663760fba10224b43f Mon Sep 17 00:00:00 2001 From: filmroellchen Date: Tue, 4 Feb 2025 20:21:07 +0100 Subject: [PATCH 1/2] robots.txt --- install.sh | 1 + orga_mediawiki/orga_mediawiki.conf | 11 ++++++++--- public_mediawiki/public_mediawiki.conf | 11 ++++++++--- robots.txt | 3 +++ 4 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 robots.txt diff --git a/install.sh b/install.sh index 8ff826c..c2561e3 100755 --- a/install.sh +++ b/install.sh @@ -7,6 +7,7 @@ set +e ln -fs "$scriptdir/smw-jobs.sh" /usr/local/bin/smw-jobs ln -fs "$scriptdir/nginx.conf" /etc/nginx/nginx.conf ln -fs "$scriptdir/fastcgi.conf" /etc/nginx/fastcgi.conf +ln -fs "$scriptdir/robots.txt" /etc/nginx/robots.txt ln -fs "$scriptdir/public_mediawiki/public_mediawiki.conf" /etc/nginx/sites-enabled/public_mediawiki.conf ln -fs "$scriptdir/orga_mediawiki/orga_mediawiki.conf" /etc/nginx/sites-enabled/orga_mediawiki.conf ln -fs "$scriptdir/pgtune.conf" "/etc/postgresql/15/main/conf.d/pgtune.conf" diff --git a/orga_mediawiki/orga_mediawiki.conf b/orga_mediawiki/orga_mediawiki.conf index e7fb257..fa2a08f 100644 --- a/orga_mediawiki/orga_mediawiki.conf +++ b/orga_mediawiki/orga_mediawiki.conf @@ -9,9 +9,14 @@ server { client_body_timeout 60; index index.php index.html index.htm; - location ~ \.ht { - deny all; - } + location ~ \.ht { + deny all; + } + + location /robots.txt { + root /etc/nginx; + try_files /robots.txt =404; + } location / { try_files $uri $uri/ @rewrite; diff --git a/public_mediawiki/public_mediawiki.conf b/public_mediawiki/public_mediawiki.conf index 8d36cb6..c89ff63 100644 --- a/public_mediawiki/public_mediawiki.conf +++ b/public_mediawiki/public_mediawiki.conf @@ -9,9 +9,14 @@ server { client_body_timeout 60; index index.php index.html index.htm; - location ~ \.ht { - deny all; - } + location ~ \.ht { + deny all; + } + + location /robots.txt { + root /etc/nginx; + try_files /robots.txt =404; + } location / { try_files $uri $uri/ @rewrite; diff --git a/robots.txt b/robots.txt new file mode 100644 index 0000000..b93e3f5 --- /dev/null +++ b/robots.txt @@ -0,0 +1,3 @@ +User-Agent: * +Disallow: / + From f3ca94de27aae1b4b8aa7bc9a2cefeced1985fbf Mon Sep 17 00:00:00 2001 From: filmroellchen Date: Tue, 4 Feb 2025 21:17:46 +0100 Subject: [PATCH 2/2] more extensions! --- public_mediawiki/LocalSettings.php | 15 ++++++++++ public_mediawiki/composer.local.json | 42 +++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/public_mediawiki/LocalSettings.php b/public_mediawiki/LocalSettings.php index 3551693..96b2a41 100755 --- a/public_mediawiki/LocalSettings.php +++ b/public_mediawiki/LocalSettings.php @@ -159,6 +159,10 @@ wfLoadExtension( 'TemplateData' ); wfLoadExtension( 'TitleBlacklist' ); wfLoadExtension( 'VisualEditor' ); wfLoadExtension( 'WikiEditor' ); +wfLoadExtension( 'CodeMirror' ); +wfLoadExtension( 'TemplateStyles' ); +wfLoadExtension( 'TemplateStylesExtender' ); +wfLoadExtension( 'Widgets' ); wfLoadExtension( 'PluggableAuth' ); wfLoadExtension( 'OpenIDConnect' ); @@ -180,6 +184,10 @@ $wgGroupPermissions['sysop']['createaccount'] = true; # allow copy uploads by anyone $wgGroupPermissions['user']['upload_by_url'] = true; +# disallow widget editing by anyone except sysops +$wgGroupPermissions['*']['editwidgets'] = false; +$wgGroupPermissions['sysop']['editwidgets'] = true; + # SSO config # necessary to allow admin user(s) to login $wgPluggableAuth_EnableLocalLogin = true; @@ -204,6 +212,8 @@ $wgPluggableAuth_Config["Chaostreff Backnang IdP"] = [ ] ]; +$wgDefaultUserOptions['usecodemirror'] = 1; + # interwiki config $wgGroupPermissions['sysop']['interwiki'] = true; $wgInterwikiMagic = true; @@ -223,3 +233,8 @@ $wgFileExtensions[] = 'svg'; # This extension will no longer be needed in MediaWiki >= 1.41, then $wgSVGNativeRendering can be used wfLoadExtension( 'NativeSvgHandler' ); +# do not sanitize my CSS +#$wgTemplateStylesAutoParseContent = false; +$wgTemplateStylesExtenderEnablePrefersColorScheme = true; +$wgTemplateStylesExtenderEnableCssVars = true; + diff --git a/public_mediawiki/composer.local.json b/public_mediawiki/composer.local.json index 489afd2..45dfb59 100644 --- a/public_mediawiki/composer.local.json +++ b/public_mediawiki/composer.local.json @@ -3,6 +3,42 @@ { "type": "vcs", "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/OpenIDConnect" + }, + { + "type": "package", + "package": { + "name": "mediawiki/codemirror", + "version": "6.0.0", + "source": { + "type": "git", + "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror.git", + "reference": "REL1_39" + } + } + }, + { + "type": "package", + "package": { + "name": "mediawiki/templatestyles", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateStyles", + "reference": "REL1_39" + } + } + }, + { + "type": "package", + "package": { + "name": "mediawiki/widgets", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://gerrit.wikimedia.org/r/mediawiki/extensions/Widgets", + "reference": "1.6.0" + } + } } ], "require": { @@ -12,7 +48,11 @@ "mediawiki/semantic-compound-queries": "^2.2", "mediawiki/semantic-extra-special-properties": "^3", "mediawiki/semantic-media-wiki": "^4.2", - "mediawiki/semantic-result-formats": "^4.2" + "mediawiki/semantic-result-formats": "^4.2", + "mediawiki/codemirror": "^6", + "mediawiki/templatestyles": "^1", + "octfx/template-styles-extender": "^1.2", + "mediawiki/widgets": "^1.6" }, "config": { "preferred-install": "source",