[PATCH] ds389/ds389log: make configuration variables actually configurable..

[Marko Myllynen <myllynen@xxxxxxxxxx>]

---
 src/pmdas/ds389/pmdads389.pl       |   20 ++++++++++----------
 src/pmdas/ds389log/pmdads389log.pl |   20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/pmdas/ds389/pmdads389.pl b/src/pmdas/ds389/pmdads389.pl
index 5c00c29..4fa4fa2 100644
--- a/src/pmdas/ds389/pmdads389.pl
+++ b/src/pmdas/ds389/pmdads389.pl
@@ -18,22 +18,22 @@ use PCP::PMDA;
 use Net::LDAP;
 use POSIX;
 
-my $server = 'localhost';
-my $binddn = 'cn=Directory Manager';
-my $bindpw = 'Manager12';
-my $scope  = 'base';
-my $cnbase = 'cn=monitor';
-my $urbase = 'cn=monitor,cn=userRoot,cn=ldbm database,cn=plugins,cn=config';
-my $filter = '(objectclass=*)';
-my $query_interval = 2; # seconds
-
-use vars qw( $ldap $pmda %metrics );
+our $server = 'localhost';
+our $binddn = 'cn=Directory Manager';
+our $bindpw = 'Manager12';
+our $scope  = 'base';
+our $cnbase = 'cn=monitor';
+our $urbase = 'cn=monitor,cn=userRoot,cn=ldbm database,cn=plugins,cn=config';
+our $filter = '(objectclass=*)';
+our $query_interval = 2; # seconds
 
 # Configuration files for overriding the above settings
 for my $file (pmda_config('PCP_PMDAS_DIR') . '/ds389/ds389.conf', 
'./ds389.conf') {
        eval `cat $file` unless ! -f $file;
 }
 
+use vars qw( $ldap $pmda %metrics );
+
 # Timestamps
 my $ts_cn = 0;
 my $ts_ur = 0;
diff --git a/src/pmdas/ds389log/pmdads389log.pl 
b/src/pmdas/ds389log/pmdads389log.pl
index f12de75..4f6e8bb 100644
--- a/src/pmdas/ds389log/pmdads389log.pl
+++ b/src/pmdas/ds389log/pmdads389log.pl
@@ -18,11 +18,16 @@ use PCP::PMDA;
 use Date::Manip;
 use POSIX;
 
-my $lc_opts = '-D /dev/shm -s all';
-my $lc_ival = 30; # minimal query interval in seconds, must be >= 30
-my $ds_alog = ''; # empty - guess; ok if only one DS instance in use
-my $ds_logd = '/var/log/dirsrv';
-my $ds_user = 'nobody'; # empty - use root
+our $lc_opts = '-D /dev/shm -s all';
+our $lc_ival = 30; # minimal query interval in seconds, must be >= 30
+our $ds_alog = ''; # empty - guess; ok if only one DS instance in use
+our $ds_logd = '/var/log/dirsrv';
+our $ds_user = 'nobody'; # empty - use root
+
+# Configuration files for overriding the above settings
+for my $file (pmda_config('PCP_PMDAS_DIR') . '/ds389log/ds389log.conf', 
'./ds389log.conf') {
+       eval `cat $file` unless ! -f $file;
+}
 
 my %data = (
        # logconv.pl string - name - subtree - cluster - id - type
@@ -53,11 +58,6 @@ use vars qw( $pmda %metrics );
 my @lc_prev = localtime();
 my @lc_curr;
 
-# Configuration files for overriding the above settings
-for my $file (pmda_config('PCP_PMDAS_DIR') . '/ds389log/ds389log.conf', 
'./ds389log.conf') {
-       eval `cat $file` unless ! -f $file;
-}
-
 sub ds389log_set_ds_access_log {
        $ds_alog = `ls -1 $ds_logd/slapd-*/access 2>/dev/null | tail -n 1`;
        my $un = `id -un`;
-- 
1.7.1