Faidon has submitted this change and it was merged. Change subject: contint: update apache conf file headers ......................................................................
contint: update apache conf file headers The headers in Apaches configurations were not using the proper puppet URL. We somehow forgot to update them when refactoring to a module :) Change-Id: Ifc0ac44548d3e7e212b0bc33221c92611eee89d9 --- M modules/contint/files/apache/integration.mediawiki.org M modules/contint/files/apache/integration.wikimedia.org M modules/contint/files/apache/proxy_jenkins M modules/contint/files/apache/proxy_zuul M modules/contint/files/apache/qunit.localhost 5 files changed, 11 insertions(+), 3 deletions(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/contint/files/apache/integration.mediawiki.org b/modules/contint/files/apache/integration.mediawiki.org index a1104de..28bf24a 100644 --- a/modules/contint/files/apache/integration.mediawiki.org +++ b/modules/contint/files/apache/integration.mediawiki.org @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/integration.mediawiki.org +### puppet:///modules/contint/apache/integration.mediawiki.org ##################################################################### # vim: filetype=apache diff --git a/modules/contint/files/apache/integration.wikimedia.org b/modules/contint/files/apache/integration.wikimedia.org index d6547e3..94e5e49 100644 --- a/modules/contint/files/apache/integration.wikimedia.org +++ b/modules/contint/files/apache/integration.wikimedia.org @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/integration.wikimedia.org +### puppet:///modules/contint/apache/integration.wikimedia.org ##################################################################### # vim: filetype=apache diff --git a/modules/contint/files/apache/proxy_jenkins b/modules/contint/files/apache/proxy_jenkins index 79d0e40..1b5b1dd 100644 --- a/modules/contint/files/apache/proxy_jenkins +++ b/modules/contint/files/apache/proxy_jenkins @@ -1,3 +1,7 @@ +##################################################################### +### THIS FILE IS MANAGED BY PUPPET +### puppet:///modules/contint/apache/proxy_jenkins +##################################################################### # vim: filetype=apache ProxyPass /ci http://localhost:8080/ci diff --git a/modules/contint/files/apache/proxy_zuul b/modules/contint/files/apache/proxy_zuul index 2ab9a6e..8b338cd 100644 --- a/modules/contint/files/apache/proxy_zuul +++ b/modules/contint/files/apache/proxy_zuul @@ -1,3 +1,7 @@ +##################################################################### +### THIS FILE IS MANAGED BY PUPPET +### puppet:///modules/contint/apache/proxy_zuul +##################################################################### # vim: filetype=apache ProxyPass /zuul/ http://localhost:8001/ diff --git a/modules/contint/files/apache/qunit.localhost b/modules/contint/files/apache/qunit.localhost index 820ebe0..9181fe9 100644 --- a/modules/contint/files/apache/qunit.localhost +++ b/modules/contint/files/apache/qunit.localhost @@ -1,6 +1,6 @@ ##################################################################### ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/qunit.localhost +### puppet:///modules/contint/apache/qunit.localhost ##################################################################### # vim: filetype=apache -- To view, visit https://gerrit.wikimedia.org/r/54465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc0ac44548d3e7e212b0bc33221c92611eee89d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Faidon <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
