Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203028
Change subject: statsite: support debian systems
......................................................................
statsite: support debian systems
Change-Id: Ibcaeae29e7f99397987b764731d70e4775a1ac55
---
M modules/statsite/manifests/init.pp
M modules/statsite/manifests/instance.pp
2 files changed, 48 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/203028/1
diff --git a/modules/statsite/manifests/init.pp
b/modules/statsite/manifests/init.pp
index 266ba03..9ad81f1 100644
--- a/modules/statsite/manifests/init.pp
+++ b/modules/statsite/manifests/init.pp
@@ -32,31 +32,41 @@
mode => '0555',
}
- file { '/sbin/statsitectl':
- source => 'puppet:///modules/statsite/statsitectl',
- mode => '0755',
+ if os_version('ubuntu >= precise') {
+ file { '/sbin/statsitectl':
+ source => 'puppet:///modules/statsite/statsitectl',
+ mode => '0755',
+ }
+
+ file { '/etc/init/statsite':
+ source => 'puppet:///modules/statsite/init',
+ recurse => true,
+ purge => true,
+ force => true,
+ }
+
+ # prevent the system-wide statsite from starting
+ file { '/etc/init/statsite.override':
+ content => 'manual',
+ before => Package['statsite'],
+ }
+
+ service { 'statsite':
+ ensure => 'running',
+ provider => 'base',
+ restart => '/sbin/statsitectl restart',
+ start => '/sbin/statsitectl start',
+ status => '/sbin/statsitectl status',
+ stop => '/sbin/statsitectl stop',
+ require => Package['statsite'],
+ }
}
- file { '/etc/init/statsite':
- source => 'puppet:///modules/statsite/init',
- recurse => true,
- purge => true,
- force => true,
- }
-
- # prevent the system-wide statsite from starting
- file { '/etc/init/statsite.override':
- content => 'manual',
- before => Package['statsite'],
- }
-
- service { 'statsite':
- ensure => 'running',
- provider => 'base',
- restart => '/sbin/statsitectl restart',
- start => '/sbin/statsitectl start',
- status => '/sbin/statsitectl status',
- stop => '/sbin/statsitectl stop',
- require => Package['statsite'],
+ if os_version('debian >= jessie') {
+ service { 'statsite':
+ ensure => 'running',
+ provider => 'systemd',
+ require => Package['statsite'],
+ }
}
}
diff --git a/modules/statsite/manifests/instance.pp
b/modules/statsite/manifests/instance.pp
index 709d634..371a0da 100644
--- a/modules/statsite/manifests/instance.pp
+++ b/modules/statsite/manifests/instance.pp
@@ -28,9 +28,19 @@
) {
$stream_cmd = "python /usr/lib/statsite/sinks/graphite.py $graphite_host
$graphite_port"
- file { "/etc/statsite/$port.ini":
- content => template('statsite/statsite.ini.erb'),
- require => Package['statsite'],
- notify => Service['statsite'],
+ if os_version('ubuntu >= precise') {
+ file { "/etc/statsite/$port.ini":
+ content => template('statsite/statsite.ini.erb'),
+ require => Package['statsite'],
+ notify => Service['statsite'],
+ }
+ }
+
+ if os_version('debian >= jessie') {
+ file { "/etc/statsite.ini":
+ content => template('statsite/statsite.ini.erb'),
+ require => Package['statsite'],
+ notify => Service['statsite'],
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/203028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcaeae29e7f99397987b764731d70e4775a1ac55
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
