Andrew Bogott has submitted this change and it was merged.
Change subject: contint: dupe /srv/org/wikimedia
......................................................................
contint: dupe /srv/org/wikimedia
With the renaming of /srv/org/mediawiki, we ended up with a duplicate
file defintion for /srv/org/wikimedia
Also fixed indentation in an apache_site call.
Change-Id: Ibce9608b302141fc943a4ed0d4bf7aa727a2d6ce
---
M modules/contint/manifests/website.pp
1 file changed, 1 insertion(+), 8 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index f4d83f7..a2581e6 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -42,14 +42,7 @@
apache_site { 'integration.mediawiki.org':
# Make sure the old configuration does not conflict
ensure => absent,
- name => 'integration.mediawiki.org',
- }
-
- file { '/srv/org/wikimedia':
- ensure => directory,
- mode => '0775',
- owner => 'jenkins',
- group => 'jenkins',
+ name => 'integration.mediawiki.org',
}
file { '/srv/localhost':
--
To view, visit https://gerrit.wikimedia.org/r/54000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibce9608b302141fc943a4ed0d4bf7aa727a2d6ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
