Herron has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386696 )
Change subject: puppet: add puppet-master.conf to avoid conflict at pkg install
time
......................................................................
puppet: add puppet-master.conf to avoid conflict at pkg install time
Upon install/upgrade the puppet-master-passenger 4.8 package creates
/etc/apache2/sites-enabled/puppet-master.conf which conflicts with
our own 50- prefixed config file and breaks apache.
This will create an empty file to prevent apache breakage
at install/upgrade time.
Bug: T179102
Change-Id: I8bf4c837cce74b482defd9faae9b0de2e6ec1acc
---
M modules/puppetmaster/manifests/passenger.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/386696/1
diff --git a/modules/puppetmaster/manifests/passenger.pp
b/modules/puppetmaster/manifests/passenger.pp
index 25726eb..d8732f3 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -58,6 +58,13 @@
require => Package['puppetmaster-passenger'],
}
+ # Place an empty puppet-master.conf file to prevent creation of this file
+ # at package install time. Apache breaks if that happens. T179102
+ file { '/etc/apache2/sites-enabled/puppet-master.conf':
+ ensure => present,
+ content => "# This file intentionally left blank by puppet - T179102"
+ }
+
# Since we are running puppet via passenger, we need to ensure
# the puppetmaster service is stopped, since they use the same port
# and will conflict when both started.
--
To view, visit https://gerrit.wikimedia.org/r/386696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bf4c837cce74b482defd9faae9b0de2e6ec1acc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron <kher...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
