Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344112 )
Change subject: librenms: use base::service_unit
......................................................................
librenms: use base::service_unit
Bug: T125020
Change-Id: I9c2c6661cd23abfc8f32309141d0c396dc2aa5ba
---
M modules/librenms/manifests/syslog.pp
A modules/librenms/templates/initscripts/librenms-syslog.systemd.erb
R modules/librenms/templates/initscripts/librenms-syslog.upstart.erb
3 files changed, 16 insertions(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/librenms/manifests/syslog.pp
b/modules/librenms/manifests/syslog.pp
index 197a4da..23c87d8 100644
--- a/modules/librenms/manifests/syslog.pp
+++ b/modules/librenms/manifests/syslog.pp
@@ -28,18 +28,10 @@
],
}
- file { '/etc/init/librenms-syslog.conf':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///modules/librenms/rsyslog-upstart.conf',
- require => File['/etc/librenms-rsyslog.conf'],
- }
-
- service { 'librenms-syslog':
- ensure => running,
- provider => 'upstart',
- subscribe => File['/etc/init/librenms-syslog.conf'],
+ base::service_unit { 'librenms-syslog':
+ ensure => present,
+ upstart => true,
+ systemd => true,
+ subscribe => File['/etc/librenms-rsyslog.conf'],
}
}
diff --git a/modules/librenms/templates/initscripts/librenms-syslog.systemd.erb
b/modules/librenms/templates/initscripts/librenms-syslog.systemd.erb
new file mode 100644
index 0000000..b3cd236
--- /dev/null
+++ b/modules/librenms/templates/initscripts/librenms-syslog.systemd.erb
@@ -0,0 +1,11 @@
+[Unit]
+Description=LibreNMS syslog daemon
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/rsyslogd -n -f /etc/librenms-rsyslog.conf -i
/var/run/librenms-rsyslogd.pid
+StandardOutput=null
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/modules/librenms/files/rsyslog-upstart.conf
b/modules/librenms/templates/initscripts/librenms-syslog.upstart.erb
similarity index 100%
rename from modules/librenms/files/rsyslog-upstart.conf
rename to modules/librenms/templates/initscripts/librenms-syslog.upstart.erb
--
To view, visit https://gerrit.wikimedia.org/r/344112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c2c6661cd23abfc8f32309141d0c396dc2aa5ba
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
