steffen: server/perl-kolab/Kolab-Conf Makefile.am, NONE, 1.1 Conf.pm, 1.54, 1.55
cvs at intevation.de
cvs at intevation.de
Wed Jun 8 14:44:37 CEST 2005
- Previous message: steffen: server/perl-kolab Makefile.am, NONE, 1.1 Makefile.cvs, NONE, 1.1 configure, NONE, 1.1 perl-kolab.spec.in, NONE, 1.1 perl-kolab.spec, 1.90, 1.91 Makefile, 1.2, NONE
- Next message: steffen: server/perl-kolab/Kolab-Cyrus Makefile.am, NONE, 1.1 Cyrus.pm, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steffen
Update of /kolabrepository/server/perl-kolab/Kolab-Conf
In directory doto:/tmp/cvs-serv22190/Kolab-Conf
Modified Files:
Conf.pm
Added Files:
Makefile.am
Log Message:
autoperlized perl-kolab. Last non-autoperl version is tagged pre_autoperl
--- NEW FILE: Makefile.am ---
include_HEADERS = Conf.pm
Index: Conf.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Conf.pm 2 Jun 2005 12:23:31 -0000 1.54
+++ Conf.pm 8 Jun 2005 12:44:35 -0000 1.55
@@ -1,10 +1,10 @@
package Kolab::Conf;
##
-## Copyright (c) 2004 Klaralvdalens Datakonsult AB
+## Copyright (c) 2004 Klaraelvdalens Datakonsult AB
## Copyright (c) 2003 Code Fusion cc
##
-## Writen by Stuart Bing?<s.binge at codefusion.co.za>
+## Writen by Stuart Bingë <s.binge at codefusion.co.za>
## Portions based on work by the following people:
##
## (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
@@ -38,6 +38,7 @@
use Kolab::LDAP;
require Exporter;
+require "config.h";
our @ISA = qw(Exporter);
@@ -106,7 +107,7 @@
}
my $config;
if (!($config = new File::Temp( TEMPLATE => 'tmpXXXXX',
- DIR => $prefix.'/etc/kolab/',
+ DIR => $prefix.$ap::config->{sysconfdir}/kolab/,
SUFFIX => '.kolabtmp',
UNLINK => 0 ))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
@@ -231,14 +232,14 @@
Kolab::log('T', "Building Postfix $map map", KOLAB_DEBUG);
my $prefix = $Kolab::config{'prefix'};
- my $cfg = "$prefix/etc/postfix/$map";
+ my $cfg = "$ap::config->{sysconfdir}/postfix/$map";
my $oldcfg = $cfg . '.old';
my $oldmask = umask 077;
copy($cfg, $oldcfg);
chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
umask $oldmask;
- copy("$prefix/etc/kolab/templates/$map.template", $cfg);
+ copy("$ap::config->{sysconfdir}/kolab/templates/$map.template", $cfg);
my $transport;
if (!($transport = IO::File->new($cfg, 'a'))) {
@@ -281,8 +282,8 @@
$transport->close;
# FIXME: bad way of doing things...
- #system("chown root:root $prefix/etc/postfix/*");
- system("$prefix/sbin/postmap $prefix/etc/postfix/$map");
+ #system("chown root:root $ap::config->{sysconfdir}/postfix/*");
+ system("$ap::config->{sbindir}/postmap $ap::config->{sysconfdir}/etc/postfix/$map");
if (-f $oldcfg) {
my $rc = `diff -q $cfg $oldcfg`;
@@ -304,12 +305,12 @@
my $prefix = $Kolab::config{'prefix'};
my $cyrustemplate;
- if (!($cyrustemplate = IO::File->new("$prefix/etc/kolab/templates/cyrus.conf.template", 'r'))) {
+ if (!($cyrustemplate = IO::File->new("$ap::config->{sysconfdir}/kolab/templates/cyrus.conf.template", 'r'))) {
Kolab::log('T', "Unable to open template file `cyrus.conf.template'", KOLAB_ERROR);
exit(1);
}
- my $cfg = "$prefix/etc/imapd/cyrus.conf";
+ my $cfg = "$ap::config->{sysconfdir}/imapd/cyrus.conf";
my $oldcfg = $cfg . '.old';
my $oldmask = umask 077;
copy($cfg, $oldcfg);
@@ -324,23 +325,23 @@
while (<$cyrustemplate>) {
if (/\@{3}cyrus-imap\@{3}/ && ($Kolab::config{"cyrus-imap"} =~ /true/i)) {
- $_ = "imap cmd=\"imapd -C $prefix/etc/imapd/imapd.conf\" listen=\"143\" prefork=0\n";
+ $_ = "imap cmd=\"imapd -C $ap::config->{sysconfdir}/imapd/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 $prefix/etc/imapd/imapd.conf\" listen=\"127.0.0.1:143\" prefork=0\n";
+ $_ = "imap cmd=\"imapd -C $ap::config->{sysconfdir}/imapd/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 $prefix/etc/imapd/imapd.conf\" listen=\"110\" prefork=0\n";
+ $_ = "pop3 cmd=\"pop3d -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"110\" prefork=0\n";
}
elsif (/\@{3}cyrus-imaps\@{3}/ && ($Kolab::config{"cyrus-imaps"} =~ /true/i)) {
- $_ = "imaps cmd=\"imapd -s -C $prefix/etc/imapd/imapd.conf\" listen=\"993\" prefork=0\n";
+ $_ = "imaps cmd=\"imapd -s -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"993\" prefork=0\n";
}
elsif (/\@{3}cyrus-pop3s\@{3}/ && ($Kolab::config{"cyrus-pop3s"} =~ /true/i)) {
- $_ = "pop3s cmd=\"pop3d -s -C $prefix/etc/imapd/imapd.conf\" listen=\"995\" prefork=0\n";
+ $_ = "pop3s cmd=\"pop3d -s -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"995\" prefork=0\n";
}
elsif (/\@{3}cyrus-sieve\@{3}/ && ($Kolab::config{"cyrus-sieve"} =~ /true/i)) {
- $_ = "sieve cmd=\"timsieved -C $prefix/etc/imapd/imapd.conf\" listen=\"2000\" prefork=0\n";
+ $_ = "sieve cmd=\"timsieved -C $ap::config->{sysconfdir}/imapd/imapd.conf\" listen=\"2000\" prefork=0\n";
}
$_ =~ s/\@{3}.*\@{3}//;
print $cyrusconf $_;
@@ -370,14 +371,14 @@
Kolab::log('T', 'Building Cyrus groups', KOLAB_DEBUG);
my $prefix = $Kolab::config{'prefix'};
- my $cfg = "$prefix/etc/imapd/imapd.group";
+ my $cfg = "$ap::config->{sysconfdir}/imapd/imapd.group";
my $oldcfg = $cfg . '.old';
my $oldmask = umask 077;
copy($cfg, $oldcfg);
chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
umask $oldmask;
- copy("$prefix/etc/kolab/templates/imapd.group.template", $cfg);
+ copy("$ap::config->{sysconfdir}/kolab/templates/imapd.group.template", $cfg);
my $groupconf;
if (!($groupconf = IO::File->new($cfg, 'a'))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
@@ -446,13 +447,13 @@
Kolab::log('T', 'Building LDAP replicas', KOLAB_DEBUG);
my $prefix = $Kolab::config{'prefix'};
- my $cfg = "$prefix/etc/openldap/slapd.replicas";
+ my $cfg = "$ap::config->{sysconfdir}/openldap/slapd.replicas";
my $oldcfg = $cfg . '.old';
my $oldmask = umask 077;
copy($cfg, $oldcfg);
chown($Kolab::config{'kolab_uid'}, $Kolab::config{'kolab_gid'}, $oldcfg);
- copy("$prefix/etc/kolab/templates/slapd.replicas.template", $cfg);
+ copy("$ap::config->{sysconfdir}/kolab/templates/slapd.replicas.template", $cfg);
my $repl;
if (!($repl = IO::File->new($cfg, 'a'))) {
Kolab::log('T', "Unable to open configuration file `$cfg'", KOLAB_ERROR);
@@ -556,77 +557,79 @@
}
my $prefix = $Kolab::config{'prefix'};
-my $templatedir = "$prefix/etc/kolab/templates";
+my $templatedir = "$ap::config->{sysconfdir}/kolab/templates";
my %templates = (
- "$templatedir/rc.conf.template" => "$prefix/etc/rc.conf",
- "$templatedir/session_vars.php.template" => "$prefix/var/kolab/php/admin/include/session_vars.php",
- "$templatedir/clamd.conf.template" => "$prefix/etc/clamav/clamd.conf",
- "$templatedir/freshclam.conf.template" => "$prefix/etc/clamav/freshclam.conf",
- "$templatedir/amavisd.conf.template" => "$prefix/etc/amavisd/amavisd.conf",
- "$templatedir/main.cf.template" => "$prefix/etc/postfix/main.cf",
- "$templatedir/master.cf.template" => "$prefix/etc/postfix/master.cf",
- "$templatedir/saslauthd.conf.template" => "$prefix/etc/sasl/saslauthd.conf",
- "$templatedir/imapd.conf.template" => "$prefix/etc/imapd/imapd.conf",
- "$templatedir/httpd.conf.template" => "$prefix/etc/apache/apache.conf",
- "$templatedir/httpd.local.template" => "$prefix/etc/apache/apache.local",
- "$templatedir/php.ini.template" => "$prefix/etc/apache/php.ini",
- "$templatedir/proftpd.conf.template" => "$prefix/etc/proftpd/proftpd.conf",
- "$templatedir/ldap.conf.template" => "$prefix/etc/openldap/ldap.conf",
- "$templatedir/slapd.conf.template" => "$prefix/etc/openldap/slapd.conf",
+ "$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/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/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/freebusy.conf.template" => "$prefix/etc/resmgr/freebusy.conf",
- "$templatedir/fbview.conf.template" => "$prefix/etc/resmgr/fbview.conf",
- "$templatedir/resmgr.conf.template" => "$prefix/etc/resmgr/resmgr.conf"
+ "$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"
);
my %permissions = (
- "$prefix/etc/rc.conf" => 0644,
- "$prefix/var/kolab/php/admin/include/session_vars.php" => 0640,
- "$prefix/etc/resmgr/freebusy.conf" => 0640,
- "$prefix/etc/resmgr/fbview.conf" => 0640,
- "$prefix/etc/resmgr/resmgr.conf" => 0640,
- "$prefix/etc/postfix/main.cf" => 0640,
- "$prefix/etc/postfix/master.cf" => 0640,
- "$prefix/etc/clamav/clamd.conf" => 0640,
- "$prefix/etc/clamav/freshclam.conf" => 0640,
- "$prefix/etc/amavisd/amavisd.conf" => 0640,
- "$prefix/etc/sasl/saslauthd.conf" => 0600,
- "$prefix/etc/imapd/imapd.conf" => 0640,
- "$prefix/etc/apache/apache.conf" => 0640,
- "$prefix/etc/apache/apache.local" => 0640,
- "$prefix/etc/apache/php.ini" => 0640,
- "$prefix/etc/proftpd/proftpd.conf" => 0640,
- "$prefix/etc/openldap/slapd.conf" => 0640,
+ "$ap::config->{sysconfdir}/rc.conf" => 0644,
+ "$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->{sysconfdir}/amavisd/amavisd.conf" => 0640,
+ "$ap::config->{sysconfdir}/sasl/saslauthd.conf" => 0600,
+ "$ap::config->{sysconfdir}/imapd/imapd.conf" => 0640,
+ "$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,
- "$prefix/etc/openldap/ldap.conf" => 0644,
- "$prefix/etc/postfix/transport" => 0640,
- "$prefix/etc/imapd/cyrus.conf" => 0640,
- "$prefix/etc/imapd/imapd.group" => 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);
my %ownership = (
- "$prefix/etc/rc.conf" => "kolab:kolab",
- "$prefix/var/kolab/php/admin/include/session_vars.php" => "kolab:kolab-n",
- "$prefix/etc/resmgr/freebusy.conf" => "kolab:kolab-n",
- "$prefix/etc/resmgr/fbview.conf" => "kolab:kolab-n",
- "$prefix/etc/resmgr/resmgr.conf" => "kolab:kolab-n",
- "$prefix/etc/postfix/main.cf" => "kolab:kolab-r",
- "$prefix/etc/postfix/master.cf" => "kolab:kolab-r",
- "$prefix/etc/clamav/clamd.conf" => "kolab:kolab-r",
- "$prefix/etc/clamav/freshclam.conf" => "kolab:kolab-r",
- "$prefix/etc/amavisd/amavisd.conf" => "kolab:kolab-r",
- "$prefix/etc/sasl/saslauthd.conf" => "kolab:kolab",
- "$prefix/etc/imapd/imapd.conf" => "kolab:kolab-r",
- "$prefix/etc/apache/apache.conf" => "kolab:kolab-n",
- "$prefix/etc/apache/apache.local" => "kolab:kolab-n",
- "$prefix/etc/apache/php.ini" => "kolab:kolab-n",
- "$prefix/etc/proftpd/proftpd.conf" => "kolab:kolab-n",
- "$prefix/etc/openldap/ldap.conf" => "kolab:kolab",
- "$prefix/etc/openldap/slapd.conf" => "kolab:kolab",
- "$prefix/var/openldap/openldap-data/DB_CONFIG" => "kolab:kolab",
- "$prefix/etc/postfix/transport" => "root:kolab",
- "$prefix/etc/imapd/cyrus.conf" => "kolab:kolab",
- "$prefix/etc/imapd/imapd.group" => "kolab:kolab-r");
+ "$ap::config->{sysconfdir}/rc.conf" => "kolab:kolab",
+ "$ap::config->{webadmindir}/php/admin/include/session_vars.php" => "kolab:kolab-n",
+ "$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}/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->{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");
sub rebuildTemplates
@@ -696,7 +699,7 @@
=head1 AUTHOR
-Stuart Bingë¬ E<lt>s.binge at codefusion.co.zaE<gt>
+Stuart Bingë <lt>s.binge at codefusion.co.zaE<gt>
=head1 COPYRIGHT AND LICENSE
- Previous message: steffen: server/perl-kolab Makefile.am, NONE, 1.1 Makefile.cvs, NONE, 1.1 configure, NONE, 1.1 perl-kolab.spec.in, NONE, 1.1 perl-kolab.spec, 1.90, 1.91 Makefile, 1.2, NONE
- Next message: steffen: server/perl-kolab/Kolab-Cyrus Makefile.am, NONE, 1.1 Cyrus.pm, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list