Skip to content

Commit

Permalink
Switch to SymfonyMailer (#18)
Browse files Browse the repository at this point in the history
* Update LocalSettings.php

* Delete config/swiftmailer-extension.json

* Update composer.local.json

* Update Dockerfile
  • Loading branch information
alistair3149 authored Oct 22, 2024
1 parent 529aea9 commit d2a3190
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 42 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,11 @@ RUN set -eux; \
mv /var/www/mediawiki/extensions/Webauthn /var/www/mediawiki/extensions/WebAuthn; \
mv /var/www/mediawiki/skins/citizen /var/www/mediawiki/skins/Citizen; \
mv /var/www/mediawiki/extensions/Twocolconflict /var/www/mediawiki/extensions/TwoColConflict; \
mv /var/www/mediawiki/extensions/Swiftmailer /var/www/mediawiki/extensions/SwiftMailer; \
mv /var/www/mediawiki/extensions/Symfonymailer /var/www/mediawiki/extensions/SymfonyMailer; \
mv /var/www/mediawiki/extensions/Pageviewinfo /var/www/mediawiki/extensions/PageViewInfo; \
mv /var/www/mediawiki/extensions/Floatingui /var/www/mediawiki/extensions/FloatingUI; \
\
cp /var/www/mediawiki/extensions/PictureHtmlSupport/includes/ThumbnailImage.php /var/www/mediawiki/includes/media/ThumbnailImage.php; \
chown -R www-data:www-data /var/www

COPY ./config/swiftmailer-extension.json /var/www/mediawiki/extensions/SwiftMailer/extension.json

CMD ["php-fpm"]
12 changes: 6 additions & 6 deletions composer.local.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"starcitizenwiki/embedvideo": "dev-develop",
"universal-omega/dynamic-page-list3": "dev-master",
"edwardspec/mediawiki-aws-s3": "v0.13.0",
"mediawiki/swiftmailer": "1.39.0",
"mediawiki/symfonymailer": "1.39.0",
"mediawiki/semantic-media-wiki": "dev-master",
"mediawiki/semantic-extra-special-properties": "~3.0",
"mediawiki/semantic-result-formats": "dev-master",
Expand All @@ -64,7 +64,7 @@
"extensions/OATHAuth/composer.json",
"extensions/TemplateStyles/composer.json",
"extensions/AWS/composer.json",
"extensions/Swiftmailer/composer.json",
"extensions/SymfonyMailer/composer.json",
"extensions/Apiunto/composer.json",
"extensions/PageViewInfo/composer.json"
]
Expand Down Expand Up @@ -635,17 +635,17 @@
{
"type": "package",
"package": {
"name": "mediawiki/swiftmailer",
"name": "mediawiki/symfonymailer",
"type": "mediawiki-extension",
"version": "1.39.0",
"dist": {
"url": "https://github.com/wikimedia/mediawiki-extensions-SwiftMailer/archive/REL1_39.zip",
"url": "https://github.com/StarCitizenWiki/mediawiki-extensions-SymfonyMailer/archive/master.zip",
"type": "zip"
},
"source": {
"type": "git",
"url": "https://github.com/wikimedia/mediawiki-extensions-SwiftMailer.git",
"reference": "main"
"url": "https://github.com/StarCitizenWiki/mediawiki-extensions-SymfonyMailer.git",
"reference": "master"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion config/LocalSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
wfLoadExtension( 'SemanticScribunto' );
wfLoadExtension( 'Scribunto' );
wfLoadExtension( 'ShortDescription' );
wfLoadExtension( 'SwiftMailer' );
wfLoadExtension( 'SymfonyMailer' );
wfLoadExtension( 'SyntaxHighlight_GeSHi' );
wfLoadExtension( 'TabberNeue' );
wfLoadExtension( 'TemplateData' );
Expand Down
32 changes: 0 additions & 32 deletions config/swiftmailer-extension.json

This file was deleted.

0 comments on commit d2a3190

Please sign in to comment.