Faidon Liambotis has submitted this change and it was merged.

Change subject: librenms: update settings for newer version
......................................................................


librenms: update settings for newer version

Change-Id: I44509f968276b9cd39889d94cbddcb9f2cb60980
---
M manifests/role/librenms.pp
M modules/librenms/templates/config.php.erb
2 files changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/manifests/role/librenms.pp b/manifests/role/librenms.pp
index 70e0c69..8d3c85f 100644
--- a/manifests/role/librenms.pp
+++ b/manifests/role/librenms.pp
@@ -16,10 +16,16 @@
     $config = {
         'title_image'      => 
'url(//upload.wikimedia.org/wikipedia/commons/thumb/c/c4/Wikimedia_Foundation_RGB_logo_with_text.svg/100px-Wikimedia_Foundation_RGB_logo_with_text.svg.png)',
 
+        # disable evil daily auto-git pull
+        'update'           => 0,
+
         'db_host'          => 'm1-master.eqiad.wmnet',
         'db_user'          => $passwords::librenms::db_user,
         'db_pass'          => $passwords::librenms::db_pass,
         'db_name'          => 'librenms',
+        'db'               => {
+            'extension' => 'mysqli',
+        },
 
         'snmp'             => {
             'community' => [ $passwords::network::snmp_ro_community ],
diff --git a/modules/librenms/templates/config.php.erb 
b/modules/librenms/templates/config.php.erb
index 31ad31f..dc5b797 100644
--- a/modules/librenms/templates/config.php.erb
+++ b/modules/librenms/templates/config.php.erb
@@ -6,6 +6,7 @@
 $config['html_dir']    = "<%= @install_dir %>/html";
 $config['rrd_dir']     = "<%= @rrd_dir %>";
 $config['log_file']    = "/var/log/librenms.log";
+$config['user']        = "librenms";
 
 $puppet_config = <%= scope.function_phpdump([@config]) %>;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44509f968276b9cd39889d94cbddcb9f2cb60980
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to