diff --git a/install.sh b/install.sh index c2561e3..8ff826c 100755 --- a/install.sh +++ b/install.sh @@ -7,7 +7,6 @@ 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 fa2a08f..e7fb257 100644 --- a/orga_mediawiki/orga_mediawiki.conf +++ b/orga_mediawiki/orga_mediawiki.conf @@ -9,14 +9,9 @@ server { client_body_timeout 60; index index.php index.html index.htm; - location ~ \.ht { - deny all; - } - - location /robots.txt { - root /etc/nginx; - try_files /robots.txt =404; - } + location ~ \.ht { + deny all; + } location / { try_files $uri $uri/ @rewrite; diff --git a/public_mediawiki/LocalSettings.php b/public_mediawiki/LocalSettings.php index 96b2a41..3551693 100755 --- a/public_mediawiki/LocalSettings.php +++ b/public_mediawiki/LocalSettings.php @@ -159,10 +159,6 @@ wfLoadExtension( 'TemplateData' ); wfLoadExtension( 'TitleBlacklist' ); wfLoadExtension( 'VisualEditor' ); wfLoadExtension( 'WikiEditor' ); -wfLoadExtension( 'CodeMirror' ); -wfLoadExtension( 'TemplateStyles' ); -wfLoadExtension( 'TemplateStylesExtender' ); -wfLoadExtension( 'Widgets' ); wfLoadExtension( 'PluggableAuth' ); wfLoadExtension( 'OpenIDConnect' ); @@ -184,10 +180,6 @@ $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; @@ -212,8 +204,6 @@ $wgPluggableAuth_Config["Chaostreff Backnang IdP"] = [ ] ]; -$wgDefaultUserOptions['usecodemirror'] = 1; - # interwiki config $wgGroupPermissions['sysop']['interwiki'] = true; $wgInterwikiMagic = true; @@ -233,8 +223,3 @@ $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 45dfb59..489afd2 100644 --- a/public_mediawiki/composer.local.json +++ b/public_mediawiki/composer.local.json @@ -3,42 +3,6 @@ { "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": { @@ -48,11 +12,7 @@ "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/codemirror": "^6", - "mediawiki/templatestyles": "^1", - "octfx/template-styles-extender": "^1.2", - "mediawiki/widgets": "^1.6" + "mediawiki/semantic-result-formats": "^4.2" }, "config": { "preferred-install": "source", diff --git a/public_mediawiki/public_mediawiki.conf b/public_mediawiki/public_mediawiki.conf index c89ff63..8d36cb6 100644 --- a/public_mediawiki/public_mediawiki.conf +++ b/public_mediawiki/public_mediawiki.conf @@ -9,14 +9,9 @@ server { client_body_timeout 60; index index.php index.html index.htm; - location ~ \.ht { - deny all; - } - - location /robots.txt { - root /etc/nginx; - try_files /robots.txt =404; - } + location ~ \.ht { + deny all; + } location / { try_files $uri $uri/ @rewrite; diff --git a/robots.txt b/robots.txt deleted file mode 100644 index b93e3f5..0000000 --- a/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -User-Agent: * -Disallow: / -