Dzahn has submitted this change and it was merged.
Change subject: restore integration.mediawiki.org config
......................................................................
restore integration.mediawiki.org config
integration.mediawiki.org is supposed to redirect permanently to wm.org
equivalent. When doing the documentation, we disabled its configuration
entirely and thus the redirection is not enabled.
This change reenable int.mw.org apache config (which just redirect).
Change-Id: I601b8b279d6e16331c76d802987a12beff89aea0
---
M modules/contint/manifests/website.pp
1 file changed, 11 insertions(+), 5 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index 8f93712..1dbcf60 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -39,15 +39,21 @@
group => 'root',
source => 'puppet:///modules/contint/apache/integration.wikimedia.org',
}
- apache_site { 'integration.mediawiki.org':
- # Make sure the old configuration does not conflict
- ensure => absent,
- name => 'integration.mediawiki.org',
- }
apache_site { 'integration.wikimedia.org':
name => 'integration.wikimedia.org',
}
+ # Apache configuration for integration.mediawiki.org
+ file { '/etc/apache2/sites-available/integration.mediawiki.org':
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/contint/apache/integration.mediawiki.org',
+ }
+ apache_site { 'integration.mediawiki.org':
+ name => 'integration.mediawiki.org',
+ }
+
file { '/srv/localhost':
ensure => directory,
mode => '0775',
--
To view, visit https://gerrit.wikimedia.org/r/54068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I601b8b279d6e16331c76d802987a12beff89aea0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
