[MediaWiki-commits] [Gerrit] operations/puppet[production]: base: check remote_syslog and remote_syslog_tls for emptyness

2017-10-03 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/381944 )

Change subject: base: check remote_syslog and remote_syslog_tls for emptyness
..


base: check remote_syslog and remote_syslog_tls for emptyness

Bug: T136312
Change-Id: Ic10c81b7e5ab46f86c509073abdab433040ff87c
---
M modules/profile/manifests/base.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved
  Volans: Looks good to me, but someone else must approve



diff --git a/modules/profile/manifests/base.pp 
b/modules/profile/manifests/base.pp
index ad59a12..059f43f 100644
--- a/modules/profile/manifests/base.pp
+++ b/modules/profile/manifests/base.pp
@@ -50,7 +50,7 @@
 
 class { '::rsyslog': }
 
-if $remote_syslog {
+unless empty($remote_syslog) and empty($remote_syslog_tls) {
 class { '::base::remote_syslog':
 enable=> true,
 central_hosts => $remote_syslog,

-- 
To view, visit https://gerrit.wikimedia.org/r/381944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic10c81b7e5ab46f86c509073abdab433040ff87c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base: check remote_syslog and remote_syslog_tls for emptyness

2017-10-03 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381944 )

Change subject: base: check remote_syslog and remote_syslog_tls for emptyness
..

base: check remote_syslog and remote_syslog_tls for emptyness

Bug: T136312
Change-Id: Ic10c81b7e5ab46f86c509073abdab433040ff87c
---
M modules/profile/manifests/base.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/381944/1

diff --git a/modules/profile/manifests/base.pp 
b/modules/profile/manifests/base.pp
index ad59a12..059f43f 100644
--- a/modules/profile/manifests/base.pp
+++ b/modules/profile/manifests/base.pp
@@ -50,7 +50,7 @@
 
 class { '::rsyslog': }
 
-if $remote_syslog {
+unless empty($remote_syslog) and empty($remote_syslog_tls) {
 class { '::base::remote_syslog':
 enable=> true,
 central_hosts => $remote_syslog,

-- 
To view, visit https://gerrit.wikimedia.org/r/381944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic10c81b7e5ab46f86c509073abdab433040ff87c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits