Andrew Bogott has submitted this change and it was merged.
Change subject: Stamp out the last reference to nginx_site, remove.
......................................................................
Stamp out the last reference to nginx_site, remove.
Change-Id: Ided1b69121145c7eb6b9403f8937ac422231fa6b
---
M manifests/generic-definitions.pp
M modules/protoproxy/manifests/ganglia.pp
2 files changed, 1 insertion(+), 33 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/generic-definitions.pp b/manifests/generic-definitions.pp
index 88f6144..fcbb75b 100644
--- a/manifests/generic-definitions.pp
+++ b/manifests/generic-definitions.pp
@@ -123,39 +123,7 @@
}
-# Enables a certain NGINX site
-define nginx_site($install=false, $template="", $enable=true) {
- if ( $template == "" ) {
- $template_name = $name
- } else {
- $template_name = $template
- }
- if ( $enable == true ) {
- file { "/etc/nginx/sites-enabled/${name}":
- ensure => "/etc/nginx/sites-available/${name}",
- }
- } else {
- file { "/etc/nginx/sites-enabled/${name}":
- ensure => absent;
- }
- }
-
- case $install {
- true: {
- file { "/etc/nginx/sites-available/${name}":
- source => "puppet:///files/nginx/sites/${name}";
- }
- }
- "template": {
- file { "/etc/nginx/sites-available/${name}":
- content =>
template("nginx/sites/${template_name}.erb");
- }
- }
- }
-}
-
# Create a symlink in /etc/init.d/ to a generic upstart init script
-
define upstart_job($install="false", $start="false") {
# Create symlink
file { "/etc/init.d/${title}":
diff --git a/modules/protoproxy/manifests/ganglia.pp
b/modules/protoproxy/manifests/ganglia.pp
index df8d937..6bac422 100644
--- a/modules/protoproxy/manifests/ganglia.pp
+++ b/modules/protoproxy/manifests/ganglia.pp
@@ -15,7 +15,7 @@
}
# Dummy site to provide a status to Ganglia
- nginx_site { 'localhost.conf':
+ nginx { 'localhost.conf':
install => true,
enable => true,
require => Package['nginx'],
--
To view, visit https://gerrit.wikimedia.org/r/92011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ided1b69121145c7eb6b9403f8937ac422231fa6b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
