Ema has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295937
Change subject: Run configtest upon config file modification
......................................................................
Run configtest upon config file modification
We want puppet to fail in case of nginx configuration file errors.
Notify `service nginx configtest` upon configuration file modification.
Change-Id: Id0315273791ee22328ba36076fabe5a2fc8c450a
---
M manifests/init.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/nginx
refs/changes/37/295937/1
diff --git a/manifests/init.pp b/manifests/init.pp
index 3ffa8df..7194f72 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -57,6 +57,11 @@
hasrestart => true,
}
+ exec { 'nginx-configtest':
+ command => 'service nginx configtest',
+ refreshonly => true,
+ }
+
file { [ '/etc/nginx/conf.d', '/etc/nginx/sites-available',
'/etc/nginx/sites-enabled' ]:
ensure => ensure_directory($ensure),
recurse => true,
diff --git a/manifests/site.pp b/manifests/site.pp
index cfcbca1..b985a44 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,6 +39,7 @@
content => $content,
source => $source,
tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
+ notify => Exec['nginx-configtest'],
}
file { "/etc/nginx/sites-enabled/${basename}":
--
To view, visit https://gerrit.wikimedia.org/r/295937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0315273791ee22328ba36076fabe5a2fc8c450a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/nginx
Gerrit-Branch: master
Gerrit-Owner: Ema <e...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
