[MediaWiki-commits] [Gerrit] librenms: more syntax fixups - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: librenms: more syntax fixups
......................................................................


librenms: more syntax fixups

Change-Id: Ib6d7f358ae0b705acd64d0a6e829ca0854151d2a
---
M manifests/role/librenms.pp
M modules/librenms/manifests/init.pp
2 files changed, 13 insertions(+), 2 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/librenms.pp b/manifests/role/librenms.pp
index e596a96..4eb22f5 100644
--- a/manifests/role/librenms.pp
+++ b/manifests/role/librenms.pp
@@ -7,6 +7,14 @@
 
     $sitename = 'librenms.wikimedia.org'
 
+    # FIXME: deployment::target really needs to handle this better
+    file { [ '/srv/deployment', '/srv/deployment/librenms' ]:
+        ensure => directory,
+        owner  => 'root',
+        group  => 'root',
+        mode   => '0755',
+    }
+
     deployment::target { 'librenms': }
     $install_dir = '/srv/deployment/librenms/librenms'
 
diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index 7f106bc..a965a2b 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -44,11 +44,11 @@
         require => Group['librenms'],
     }
 
-    file { '/var/lib/librenms/rrd':
+    file { [ '/var/lib/librenms', '/var/lib/librenms/rrd' ]:
         ensure  => directory,
         owner   => 'librenms',
         group   => 'librenms',
-        mode    => '0555',
+        mode    => '0755',
     }
 
     file { '/etc/logrotate.d/librenms':
@@ -85,17 +85,20 @@
         command => "${install_dir}/discovery.php -h all >> /dev/null 2>&1",
         hour    => '*/6',
         minute  => '33',
+        require => User['librenms'],
     }
     cron { 'librenms-discovery-new':
         ensure  => present,
         user    => 'librenms',
         command => "${install_dir}/discovery.php -h all >> /dev/null 2>&1",
         minute  => '*/5',
+        require => User['librenms'],
     }
     cron { 'librenms-poller-all':
         ensure  => present,
         user    => 'librenms',
         command => "${install_dir}/poller.php -h all >> /dev/null 2>&1",
         minute  => '*/5',
+        require => User['librenms'],
     }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6d7f358ae0b705acd64d0a6e829ca0854151d2a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

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