diff --git a/pillar/saas/mediawiki.sls b/pillar/saas/mediawiki.sls index 6dcb352..4627405 100644 --- a/pillar/saas/mediawiki.sls +++ b/pillar/saas/mediawiki.sls @@ -1,49 +1,56 @@ # ------------------------------------------------------------- # Salt — MediaWiki farm # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2018-03-16 # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- mediawiki_extensions: - CategoryTree - Cite - CodeEditor - ConfirmEdit - ContactPage - Echo + - FlaggedRevs - Flow - Gadgets - ParserFunctions - Poem + - ProofreadPage - Scribunto - SyntaxHighlight_GeSHi - Thanks - WikiEditor mediawiki_skins: - MonoBook - Timeless - Vector mediawiki_saas: directory: /var/51-wwwroot/saas-mediawiki mediawiki_directory: /srv/mediawiki fastcgi_url: unix:/var/run/web/wikis.nasqueron.org/php-fpm.sock db: host: localhost user: mediawiki-saas mediawiki_datastores: ### ### Nasqueron ### - agora.nasqueron.org + ### + ### MediaWiki code tests + ### + - migration.mediawiki.test.ook.space + ### ### Other wikis hosted on the Nasqueron servers ### - arsmagica.espace-win.org - utopia.espace-win.org - www.wolfplex.org diff --git a/roles/webserver-legacy/nginx/files/vhosts/test.ook.space/migration.mediawiki.conf b/roles/webserver-legacy/nginx/files/vhosts/test.ook.space/migration.mediawiki.conf new file mode 100644 index 0000000..b6aee5e --- /dev/null +++ b/roles/webserver-legacy/nginx/files/vhosts/test.ook.space/migration.mediawiki.conf @@ -0,0 +1,40 @@ +# ------------------------------------------------------------- +# Webserver +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Project: Nasqueron +# Site: migration.mediawiki.test.ook.space +# License: Trivial work, not eligible to copyright +# Source file: roles/saas-mediawiki/nginx/files/vhosts/test.ook.space/mediawiki.conf +# ------------------------------------------------------------- +# +# +# This file is managed by our rOPS SaltStack repository. +# +# Changes to this file may cause incorrect behavior +# and will be lost if the state is redeployed. +# + +server { + listen 80; + listen [::]:80; + server_name migration.mediawiki.test.ook.space; + + include includes/letsencrypt; + + return 301 https://migration.mediawiki.test.ook.space$request_uri; +} + +server { + server_name migration.mediawiki.test.ook.space; + + include includes/tls; + ssl_certificate /usr/local/etc/letsencrypt/live/migration.mediawiki.test.ook.space/fullchain.pem; + ssl_certificate_key /usr/local/etc/letsencrypt/live/migration.mediawiki.test.ook.space/privkey.pem; + + error_log /var/log/www/ook.space/migration-mediawiki-test-error.log; + access_log /var/log/www/ook.space/migration-mediawiki-test-access.log; + + include includes/letsencrypt; + + include includes/mediawiki-wiki; +}