steffen: server/perl-kolab/Kolab-Conf Conf.pm,1.55,1.56
cvs at intevation.de
cvs at intevation.de
Thu Jun 30 03:43:57 CEST 2005
Author: steffen
Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv19892/Kolab-Conf
Modified Files:
Conf.pm
Log Message:
more autoperlization
Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Conf.pm 8 Jun 2005 12:44:35 -0000 1.55
+++ Conf.pm 30 Jun 2005 01:43:55 -0000 1.56
@@ -107,7 +107,7 @@
}
my $config;
if (!($config = new File::Temp( TEMPLATE => 'tmpXXXXX',
- DIR => $prefix.$ap::config->{sysconfdir}/kolab/,
+ DIR => $ap::config->{sysconfdir}. "/kolab/",
SUFFIX => '.kolabtmp',
UNLINK => 0 ))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
@@ -283,7 +283,7 @@
# FIXME: bad way of doing things...
#system("chown root:root $ap::config->{sysconfdir}/postfix/*");
- system("$ap::config->{sbindir}/postmap $ap::config->{sysconfdir}/etc/postfix/$map");
+ system("$ap::config->{sbindir}/postmap $ap::config->{sysconfdir}/postfix/$map");
if (-f $oldcfg) {
my $rc = `diff -q $cfg $oldcfg`;
@@ -310,7 +310,7 @@
exit(1);
}
- my $cfg = "$ap::config->{sysconfdir}/imapd/cyrus.conf";
+ my $cfg = "$ap::config->{imap_confdir}/cyrus.conf";
my $oldcfg = $cfg . '.old';
my $oldmask = umask 077;
copy($cfg, $oldcfg);
@@ -325,23 +325,23 @@
while (<$cyrustemplate>) {
if (/\@{3}cyrus-imap\@{3}/ && ($Kolab::config{"cyrus-imap"} =~ /true/i)) {
- $_ = "imap cmd=\"imapd -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"143\" prefork=0\n";
+ $_ = "imap cmd=\"imapd -C $ap::config->{imap_confdir}/imapd.conf\" listen=\"143\" prefork=0\n";
}
elsif (/\@{3}cyrus-imap\@{3}/ && ($Kolab::config{"cyrus-imap"} =~ /false/i)) {
# Even if imapd is disabled, enable it for localhost -- resource handlers depend on it
- $_ = "imap cmd=\"imapd -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"127.0.0.1:143\" prefork=0\n";
+ $_ = "imap cmd=\"imapd -C $ap::config->{imap_confdir}/imapd.conf\" listen=\"127.0.0.1:143\" prefork=0\n";
}
elsif (/\@{3}cyrus-pop3\@{3}/ && ($Kolab::config{"cyrus-pop3"} =~ /true/i)) {
- $_ = "pop3 cmd=\"pop3d -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"110\" prefork=0\n";
+ $_ = "pop3 cmd=\"pop3d -C $ap::config->{imap_confdir}/imapd.conf\" listen=\"110\" prefork=0\n";
}
elsif (/\@{3}cyrus-imaps\@{3}/ && ($Kolab::config{"cyrus-imaps"} =~ /true/i)) {
- $_ = "imaps cmd=\"imapd -s -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"993\" prefork=0\n";
+ $_ = "imaps cmd=\"imapd -s -C $ap::config->{imap_confdir}/imapd.conf\" listen=\"993\" prefork=0\n";
}
elsif (/\@{3}cyrus-pop3s\@{3}/ && ($Kolab::config{"cyrus-pop3s"} =~ /true/i)) {
- $_ = "pop3s cmd=\"pop3d -s -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"995\" prefork=0\n";
+ $_ = "pop3s cmd=\"pop3d -s -C $ap::config->{imap_confdir}/imapd.conf\" listen=\"995\" prefork=0\n";
}
elsif (/\@{3}cyrus-sieve\@{3}/ && ($Kolab::config{"cyrus-sieve"} =~ /true/i)) {
- $_ = "sieve cmd=\"timsieved -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"2000\" prefork=0\n";
+ $_ = "sieve cmd=\"timsieved -C $ap::config->{imap_confdir}/imapd.conf\" listen=\"2000\" prefork=0\n";
}
$_ =~ s/\@{3}.*\@{3}//;
print $cyrusconf $_;
@@ -371,7 +371,7 @@
Kolab::log('T', 'Building Cyrus groups', KOLAB_DEBUG);
my $prefix = $Kolab::config{'prefix'};
- my $cfg = "$ap::config->{sysconfdir}/imapd/imapd.group";
+ my $cfg = "$ap::config->{imap_confdir}/imapd.group";
my $oldcfg = $cfg . '.old';
my $oldmask = umask 077;
@@ -562,20 +562,22 @@
my %templates = (
"$templatedir/rc.conf.template" => "$ap::config->{sysconfdir}/rc.conf",
"$templatedir/session_vars.php.template" => "$ap::config->{webadmindir}/php/admin/include/session_vars.php",
- "$templatedir/clamd.conf.template" => "$ap::config->{sysconfdir}/clamav/clamd.conf",
- "$templatedir/freshclam.conf.template" => "$ap::config->{sysconfdir}/clamav/freshclam.conf",
+ "$templatedir/clamd.conf.template" => "$ap::config->{clamav_confdir}/clamd.conf",
+ "$templatedir/freshclam.conf.template" => "$ap::config->{clamav_confdir}/freshclam.conf",
"$templatedir/amavisd.conf.template" => "$ap::config->{sysconfdir}/amavisd/amavisd.conf",
"$templatedir/main.cf.template" => "$ap::config->{sysconfdir}/postfix/main.cf",
"$templatedir/master.cf.template" => "$ap::config->{sysconfdir}/postfix/master.cf",
- "$templatedir/saslauthd.conf.template" => "$ap::config->{sysconfdir}/sasl/saslauthd.conf",
- "$templatedir/imapd.conf.template" => "$ap::config->{sysconfdir}/imapd/imapd.conf",
+ "$templatedir/saslauthd.conf.template" => "$ap::config->{sasl_confdir}/saslauthd.conf",
+ "$templatedir/imapd.conf.template" => "$ap::config->{imap_confdir}/imapd.conf",
+ "$templatedir/imapd.group.template" => "$ap::config->{imap_confdir}/imapd.group",
+ "$templatedir/cyrus.conf.template" => "$ap::config->{imap_confdir}/cyrus.conf",
"$templatedir/httpd.conf.template" => "$ap::config->{webserver_confdir}/apache.conf",
"$templatedir/httpd.local.template" => "$ap::config->{webserver_confdir}/apache.local",
"$templatedir/php.ini.template" => "$ap::config->{webserver_confdir}/php.ini",
"$templatedir/proftpd.conf.template" => "$ap::config->{ftpserver_confdir}/proftpd.conf",
"$templatedir/ldap.conf.template" => "$ap::config->{sysconfdir}/openldap/ldap.conf",
"$templatedir/slapd.conf.template" => "$ap::config->{sysconfdir}/openldap/slapd.conf",
- "$templatedir/DB_CONFIG.slapd.template" => "$prefix/var/openldap/openldap-data/DB_CONFIG",
+ "$templatedir/DB_CONFIG.slapd.template" => "$ap::config->{ldapserver_dir}/DB_CONFIG",
"$templatedir/freebusy.conf.template" => "$ap::config->{sysconfdir}/resmgr/freebusy.conf",
"$templatedir/fbview.conf.template" => "$ap::config->{sysconfdir}/resmgr/fbview.conf",
"$templatedir/resmgr.conf.template" => "$ap::config->{sysconfdir}/resmgr/resmgr.conf"
@@ -583,28 +585,28 @@
my %permissions = (
"$ap::config->{sysconfdir}/rc.conf" => 0644,
- "$ap::config->{webadmindir}/php/admin/include/session_vars.php" => 0640,
+ "$ap::config->{webadmindir}/php/admin/include/session_vars.php" => 0640,
"$ap::config->{sysconfdir}/resmgr/freebusy.conf" => 0640,
"$ap::config->{sysconfdir}/resmgr/fbview.conf" => 0640,
"$ap::config->{sysconfdir}/resmgr/resmgr.conf" => 0640,
"$ap::config->{sysconfdir}/postfix/main.cf" => 0640,
"$ap::config->{sysconfdir}/postfix/master.cf" => 0640,
- "$ap::config->{sysconfdir}/clamav/clamd.conf" => 0640,
- "$ap::config->{sysconfdir}/clamav/freshclam.conf" => 0640,
+ "$ap::config->{clamav_confdir}/clamd.conf" => 0640,
+ "$ap::config->{clamav_confdir}/freshclam.conf" => 0640,
"$ap::config->{sysconfdir}/amavisd/amavisd.conf" => 0640,
- "$ap::config->{sysconfdir}/sasl/saslauthd.conf" => 0600,
- "$ap::config->{sysconfdir}/imapd/imapd.conf" => 0640,
+ "$ap::config->{sasl_confdir}/saslauthd.conf" => 0600,
+ "$ap::config->{imap_confdir}/imapd.conf" => oct($ap::config->{'imap_confperm'}),
"$ap::config->{webserver_confdir}/apache.conf" => 0640,
"$ap::config->{webserver_confdir}/apache.local" => 0640,
"$ap::config->{webserver_confdir}/php.ini" => 0640,
"$ap::config->{ftpserver_confdir}/proftpd.conf" => 0640,
"$ap::config->{sysconfdir}/openldap/slapd.conf" => 0640,
- "$prefix/var/openldap/openldap-data/DB_CONFIG" => 0640,
+ "$ap::config->{ldapserver_dir}/DB_CONFIG" => 0640,
"$ap::config->{sysconfdir}/openldap/ldap.conf" => 0644,
"$ap::config->{sysconfdir}/postfix/transport" => 0640,
"$ap::config->{sysconfdir}/postfix/virtual" => 0640,
- "$ap::config->{sysconfdir}/imapd/cyrus.conf" => 0640,
- "$ap::config->{sysconfdir}/imapd/imapd.group" => 0640);
+ "$ap::config->{imap_confdir}/cyrus.conf" => oct($ap::config->{'imap_confperm'}),
+ "$ap::config->{imap_confdir}/imapd.group" => oct($ap::config->{'imap_confperm'}));
my %ownership = (
"$ap::config->{sysconfdir}/rc.conf" => "kolab:kolab",
@@ -612,24 +614,24 @@
"$ap::config->{sysconfdir}/resmgr/freebusy.conf" => "kolab:kolab-n",
"$ap::config->{sysconfdir}/resmgr/fbview.conf" => "kolab:kolab-n",
"$ap::config->{sysconfdir}/resmgr/resmgr.conf" => "kolab:kolab-n",
- "$ap::config->{sysconfdir}/postfix/main.cf" => "kolab:kolab-r",
- "$ap::config->{sysconfdir}/postfix/master.cf" => "kolab:kolab-r",
- "$ap::config->{sysconfdir}/clamav/clamd.conf" => "kolab:kolab-r",
- "$ap::config->{sysconfdir}/clamav/freshclam.conf" => "kolab:kolab-r",
+ "$ap::config->{sysconfdir}/postfix/main.cf" => "$ap::config->{postfix_usr}:$ap::config->{postfix_grp}",
+ "$ap::config->{sysconfdir}/postfix/master.cf" => "$ap::config->{postfix_usr}:$ap::config->{postfix_grp}",
+ "$ap::config->{clamav_confdir}/clamd.conf" => "kolab:kolab-r",
+ "$ap::config->{clamav_confdir}/freshclam.conf" => "kolab:kolab-r",
"$ap::config->{sysconfdir}/amavisd/amavisd.conf" => "kolab:kolab-r",
- "$ap::config->{sysconfdir}/sasl/saslauthd.conf" => "kolab:kolab",
- "$ap::config->{sysconfdir}/imapd/imapd.conf" => "kolab:kolab-r",
+ "$ap::config->{sasl_confdir}/saslauthd.conf" => "kolab:kolab",
+ "$ap::config->{imap_confdir}/imapd.conf" => "$ap::config->{imap_usr}:$ap::config->{imap_grp}",
"$ap::config->{webserver_confdir}/apache.conf" => "kolab:kolab-n",
"$ap::config->{webserver_confdir}/apache.local" => "kolab:kolab-n",
"$ap::config->{webserver_confdir}/php.ini" => "kolab:kolab-n",
"$ap::config->{ftpserver_confdir}/proftpd.conf" => "kolab:kolab-n",
- "$ap::config->{sysconfdir}/openldap/ldap.conf" => "kolab:kolab",
- "$ap::config->{sysconfdir}/openldap/slapd.conf" => "kolab:kolab",
- "$prefix/var/openldap/openldap-data/DB_CONFIG" => "kolab:kolab",
- "$ap::config->{sysconfdir}/postfix/transport" => "root:kolab",
- "$ap::config->{sysconfdir}/postfix/virtual" => "root:kolab",
- "$ap::config->{sysconfdir}/imapd/cyrus.conf" => "kolab:kolab",
- "$ap::config->{sysconfdir}/imapd/imapd.group" => "kolab:kolab-r");
+ "$ap::config->{sysconfdir}/openldap/ldap.conf" => "$ap::config->{ldapserver_usr}:$ap::config->{ldapserver_grp}",
+ "$ap::config->{sysconfdir}/openldap/slapd.conf" => "$ap::config->{ldapserver_usr}:$ap::config->{ldapserver_grp}",
+ "$ap::config->{ldapserver_dir}/DB_CONFIG" => "$ap::config->{ldapserver_usr}:$ap::config->{ldapserver_grp}",
+ "$ap::config->{sysconfdir}/postfix/transport" => "$ap::config->{postfix_usr}:$ap::config->{postfix_grp}",
+ "$ap::config->{sysconfdir}/postfix/virtual" => "$ap::config->{postfix_usr}:$ap::config->{postfix_grp}",
+ "$ap::config->{imap_confdir}/cyrus.conf" => "$ap::config->{imap_usr}:$ap::config->{imap_grp}",
+ "$ap::config->{imap_confdir}/imapd.group" => "$ap::config->{imap_usr}:$ap::config->{imap_grp}");
sub rebuildTemplates
More information about the commits
mailing list