[MediaWiki-commits] [Gerrit] operations/puppet[production]: LibreNMS: fix issue where service ircbot is declared twice

2017-12-19 Thread Ayounsi (Code Review) 
Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399230 )

Change subject: LibreNMS: fix issue where service ircbot is declared twice
..


LibreNMS: fix issue where service ircbot is declared twice

Change-Id: I57c311dee1bc1b70718e07b9f581269b139f7090
---
M modules/librenms/manifests/init.pp
1 file changed, 1 insertion(+), 10 deletions(-)

Approvals:
  Ayounsi: Verified; Looks good to me, approved



diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index ba6b337..0675f78 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -117,24 +117,15 @@
 
 if $active_server == $::fqdn {
 $cron_ensure = 'present'
-$ircbot_ensure = 'running'
 } else {
 $cron_ensure = 'absent'
-$ircbot_ensure = 'stopped'
 }
 
 systemd::service { 'librenms-ircbot':
-ensure  => 'present',
+ensure  => $cron_ensure,
 content => 
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
 require => [File["${install_dir}/config.php"] ],
 }
-
-service { 'librenms-ircbot':
-ensure  => $ircbot_ensure,
-enable  => true,
-require => Systemd::Service['librenms-ircbot'],
-}
-
 
 cron { 'librenms-discovery-all':
 ensure  => $cron_ensure,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57c311dee1bc1b70718e07b9f581269b139f7090
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
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]: LibreNMS: fix issue where service ircbot is declared twice

2017-12-19 Thread Ayounsi (Code Review) 
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399230 )

Change subject: LibreNMS: fix issue where service ircbot is declared twice
..

LibreNMS: fix issue where service ircbot is declared twice

Change-Id: I57c311dee1bc1b70718e07b9f581269b139f7090
---
M modules/librenms/manifests/init.pp
1 file changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/399230/1

diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index ba6b337..0675f78 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -117,24 +117,15 @@
 
 if $active_server == $::fqdn {
 $cron_ensure = 'present'
-$ircbot_ensure = 'running'
 } else {
 $cron_ensure = 'absent'
-$ircbot_ensure = 'stopped'
 }
 
 systemd::service { 'librenms-ircbot':
-ensure  => 'present',
+ensure  => $cron_ensure,
 content => 
template('librenms/initscripts/librenms-ircbot.systemd.erb'),
 require => [File["${install_dir}/config.php"] ],
 }
-
-service { 'librenms-ircbot':
-ensure  => $ircbot_ensure,
-enable  => true,
-require => Systemd::Service['librenms-ircbot'],
-}
-
 
 cron { 'librenms-discovery-all':
 ensure  => $cron_ensure,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57c311dee1bc1b70718e07b9f581269b139f7090
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 

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