jenkins-bot has submitted this change and it was merged.
Change subject: Notify Service['apache2'], not Package['apache2']
......................................................................
Notify Service['apache2'], not Package['apache2']
Explicitly depend on apache2 before attempting to create
disable-sendfile, which expects /etc/apache2/conf.d/ to be
there.
Change-Id: I9215198aabf4729c9c5d06b2769af6f1dd618f0f
---
M puppet/modules/apache/manifests/init.pp
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/apache/manifests/init.pp
b/puppet/modules/apache/manifests/init.pp
index 29b6a3d..10b78cd 100644
--- a/puppet/modules/apache/manifests/init.pp
+++ b/puppet/modules/apache/manifests/init.pp
@@ -4,9 +4,10 @@
}
file { '/etc/apache2/conf.d/disable-sendfile':
- ensure => file,
- source => 'puppet:///modules/apache/disable-sendfile',
- notify => Package['apache2'],
+ ensure => file,
+ source => 'puppet:///modules/apache/disable-sendfile',
+ require => Package['apache2'],
+ notify => Service['apache2'],
}
service { 'apache2':
--
To view, visit https://gerrit.wikimedia.org/r/60654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9215198aabf4729c9c5d06b2769af6f1dd618f0f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
