BBlack has submitted this change and it was merged.
Change subject: document nginx tag workarounds for PUP-2689
......................................................................
document nginx tag workarounds for PUP-2689
Change-Id: Ie2a922f9d57c58014738700ed91ee287846b7c75
---
M manifests/init.pp
M manifests/site.pp
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/init.pp b/manifests/init.pp
index 323ecba..53a345d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -58,7 +58,7 @@
recurse => true,
purge => true,
force => true,
- tag => 'nginx',
+ tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
}
# Order package -> config -> service for all
diff --git a/manifests/site.pp b/manifests/site.pp
index ae569d5..cfcbca1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,12 +38,12 @@
ensure => $ensure,
content => $content,
source => $source,
- tag => 'nginx',
+ tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
}
file { "/etc/nginx/sites-enabled/${basename}":
ensure => ensure_link($ensure),
target => "/etc/nginx/sites-available/${basename}",
- tag => 'nginx',
+ tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster
3.6.2+
}
}
--
To view, visit https://gerrit.wikimedia.org/r/193171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2a922f9d57c58014738700ed91ee287846b7c75
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/nginx
Gerrit-Branch: master
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
