Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53955
Change subject: misc::docsite: Remove file "doc/index.html".
......................................................................
misc::docsite: Remove file "doc/index.html".
Puppet is currently conflicting this one file with the rest
of the docroot of the documentation site in integration/docroot.git
This resolves the conflict.
Change-Id: I5b5282c26c76a8d51e5f07ea91c4e4b9fe9279df
---
M manifests/misc/docs.pp
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/53955/1
diff --git a/manifests/misc/docs.pp b/manifests/misc/docs.pp
index 0d37088..01d8316 100644
--- a/manifests/misc/docs.pp
+++ b/manifests/misc/docs.pp
@@ -9,11 +9,6 @@
source =>
'puppet:///files/apache/sites/doc.wikimedia.org';
'/srv/org/wikimedia/doc':
ensure => 'directory';
- '/srv/org/wikimedia/doc/index.html':
- mode => 0444,
- ensure => 'present',
- source => 'puppet:///files/misc/jenkins/doc_index.html',
- require => File["/srv/org/wikimedia/doc"];
}
apache_site { docs: name => 'doc.wikimedia.org' }
--
To view, visit https://gerrit.wikimedia.org/r/53955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b5282c26c76a8d51e5f07ea91c4e4b9fe9279df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <ttij...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
