Filippo Giunchedi has submitted this change and it was merged.
Change subject: apache2: rename apache2_test_config =>
apache2_test_config_and_restart
......................................................................
apache2: rename apache2_test_config => apache2_test_config_and_restart
The current name is misleading, because it does not communicate the fact that a
successful config test will lead to an Apache 2 restart.
Change-Id: Idcce8723d83b2a0fc231c005d94c6a099ab484a2
---
M modules/apache/manifests/def.pp
M modules/apache/manifests/init.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/apache/manifests/def.pp b/modules/apache/manifests/def.pp
index f9c711f..0f42771 100644
--- a/modules/apache/manifests/def.pp
+++ b/modules/apache/manifests/def.pp
@@ -23,6 +23,6 @@
ensure => $ensure,
path => '/etc/apache2/envvars',
line => "export APACHE_ARGUMENTS=\"\$APACHE_ARGUMENTS -D ${title}\"",
- notify => Exec['apache2_test_config'],
+ notify => Exec['apache2_test_config_and_restart'],
}
}
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index d593b22..c0da628 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -37,7 +37,7 @@
require => Package['apache2'],
}
- exec { 'apache2_test_config':
+ exec { 'apache2_test_config_and_restart':
command => '/usr/sbin/apache2ctl configtest',
notify => Exec['apache2_hard_restart'],
require => Service['apache2'],
--
To view, visit https://gerrit.wikimedia.org/r/149344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcce8723d83b2a0fc231c005d94c6a099ab484a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
