Andrew Bogott has submitted this change and it was merged. 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 --- D files/misc/jenkins/doc_index.html M manifests/misc/docs.pp 2 files changed, 0 insertions(+), 20 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved Hashar: Checked; Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/files/misc/jenkins/doc_index.html b/files/misc/jenkins/doc_index.html deleted file mode 100644 index 481fb87..0000000 --- a/files/misc/jenkins/doc_index.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> -<html xmlns="http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en"> -<head> -<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> -<title>doc.wikimedia.org</title> -<meta name="description" content="wikimedia docs" /> -</head> -<body> -<h3>wikimedia docs</h3> -<ul> -<li><a href="./puppet/">puppet</a></li> -<li><a href="./puppetsource/">puppetsource</a></li> -</ul> -</body> -</html> 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: merged Gerrit-Change-Id: I5b5282c26c76a8d51e5f07ea91c4e4b9fe9279df Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle <ttij...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Demon <ch...@wikimedia.org> Gerrit-Reviewer: Faidon <fai...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
