diff options
author | Gunnar Wrobel <wrobel@pardus.de> | 2010-09-21 06:01:09 (GMT) |
---|---|---|
committer | Gunnar Wrobel <wrobel@pardus.de> | 2010-09-21 06:01:09 (GMT) |
commit | 035b6ca3011aa11fe857cf9009f5c065692349e6 (patch) | |
tree | 52490588f0525562b3862632373ecbc1a33758a8 | |
parent | d8cfb63eda23f3893f9230ce2c7f375c5c89bde4 (diff) | |
download | kolab-conf-035b6ca3011aa11fe857cf9009f5c065692349e6.tar.gz |
Cleaned all templates of the dist_conf approach.
-rw-r--r-- | conf/dist/centos-clarkconnect | 5 | ||||
-rw-r--r-- | conf/dist/debian | 3 | ||||
-rw-r--r-- | conf/dist/kolab | 7 | ||||
-rw-r--r-- | conf/dist/mandriva | 2 | ||||
-rw-r--r-- | conf/dist/suse | 2 | ||||
-rw-r--r-- | conf/kolab.globals.in | 61 | ||||
-rw-r--r-- | conf/templates/DB_CONFIG.slapd.template (renamed from conf/templates/DB_CONFIG.slapd.template.in) | 6 | ||||
-rw-r--r-- | conf/templates/amavisd.conf.template (renamed from conf/templates/amavisd.conf.template.in) | 70 | ||||
-rw-r--r-- | conf/templates/httpd.conf.template (renamed from conf/templates/httpd.conf.template.in) | 82 | ||||
-rw-r--r-- | conf/templates/httpd.local.template (renamed from conf/templates/httpd.local.template.in) | 14 | ||||
-rw-r--r-- | conf/templates/kolab.conf.template (renamed from conf/templates/kolab.conf.template.in) | 0 | ||||
-rw-r--r-- | conf/templates/kolab_smtpdpolicy.conf.template (renamed from conf/templates/kolab_smtpdpolicy.conf.template.in) | 4 | ||||
-rw-r--r-- | conf/templates/ldap.conf.template (renamed from conf/templates/ldap.conf.template.in) | 4 | ||||
-rw-r--r-- | conf/templates/local.cf.template (renamed from conf/templates/local.cf.template.in) | 8 | ||||
-rw-r--r-- | conf/templates/php.ini.template (renamed from conf/templates/php.ini.template.in) | 14 | ||||
-rw-r--r-- | conf/templates/rc.conf.template (renamed from conf/templates/rc.conf.template.in) | 4 | ||||
-rw-r--r-- | conf/templates/saslauthd.conf.template (renamed from conf/templates/saslauthd.conf.template.in) | 6 | ||||
-rw-r--r-- | conf/templates/slapd.access.template (renamed from conf/templates/slapd.access.template.in) | 6 | ||||
-rw-r--r-- | conf/templates/slapd.conf.template (renamed from conf/templates/slapd.conf.template.in) | 42 | ||||
-rw-r--r-- | conf/templates/slapd.replicas.template (renamed from conf/templates/slapd.replicas.template.in) | 6 |
20 files changed, 182 insertions, 164 deletions
diff --git a/conf/dist/centos-clarkconnect b/conf/dist/centos-clarkconnect index 44e00c7..cd2e9f7 100644 --- a/conf/dist/centos-clarkconnect +++ b/conf/dist/centos-clarkconnect @@ -155,15 +155,12 @@ kolab_wui=/kolab/admin #-------------------------------------------------------------------- # OpenLDAP #-------------------------------------------------------------------- -# TODO: is ldapserver_rundir still used? - directory_mode=slurpd ldapserver_statedir=${localstatedir}/lib/ldap ldapserver_dir=${localstatedir}/lib/ldap ldapserver_replogfile=${localstatedir}/lib/ldap/replog ldapserver_argsfile=${localstatedir}/run/slapd.args ldapserver_logfile=${localstatedir}/log/messages -ldapserver_rundir=/bob ldapserver_pidfile=${sysrundir}/slapd.pid ldapserverslurpd_pidfile=${sysrundir}/slurpd.pid ldapserver_schemadir=${sysconfdir}/openldap/schema @@ -189,8 +186,6 @@ webserver_runtime_status=/var/run/webconfig.scoreboard webserver_errorlogfile=${webserver_logdir}/error_log webserver_accesslogfile=${webserver_logdir}/access.log webserver_pidfile=/var/run/webconfig.pid -webserver_mime_magicfile=/usr/webconfig/conf/magic -webserver_mime_typesfile=/usr/webconfig/conf/mime.types webserver_web_prefix=/kolab webserver_musr=kolab webserver_usr=root diff --git a/conf/dist/debian b/conf/dist/debian index 4dfcc38..e53461b 100644 --- a/conf/dist/debian +++ b/conf/dist/debian @@ -99,7 +99,6 @@ ldapserver_dir=${localstatedir}/lib/ldap ldapserver_replogfile=${ldapserver_statedir}/replog ldapserver_argsfile=${sysrundir}/slapd/slapd.args ldapserver_logfile=${localstatedir}/log/syslog -#ldapserver_rundir= ldapserver_pidfile=${sysrundir}/slapd/slapd.pid ldapserverslurpd_pidfile=${sysrundir}/slapd/slurpd.pid ldapserver_schemadir=${sysconfdir}/ldap/schema @@ -121,8 +120,6 @@ webserver_errorlogfile=${webserver_logdir}/apache-error.log webserver_accesslogfile=${webserver_logdir}/apache-access.log webserver_confdir=${sysconfdir}/apache2 webserver_pidfile=${sysrundir}/apache2/apache2.pid -webserver_mime_magicfile=${sysconfdir}/apache2/magic -webserver_mime_typesfile=${sysconfdir}/apache2/mime.types webserver_sslscache=${sysrundir}/ssl_scache webserver_sslmutex=${sysrundir}/ssl_mutex webserver_web_prefix= diff --git a/conf/dist/kolab b/conf/dist/kolab index b14afe6..0b77355 100644 --- a/conf/dist/kolab +++ b/conf/dist/kolab @@ -112,9 +112,8 @@ ldapserver_dir=${ldapserver_statedir}/openldap-data ldapserver_replogfile=${ldapserver_statedir}/replog ldapserver_argsfile=${ldapserver_statedir}/slapd.args ldapserver_logfile=${ldapserver_statedir}/openldap.log -ldapserver_rundir=${ldapserver_statedir}/run -ldapserver_pidfile=${ldapserver_rundir}/slapd.pid -ldapserverslurpd_pidfile=${ldapserver_rundir}/slurpd.pid +ldapserver_pidfile=${ldapserver_statedir}/run/slapd.pid +ldapserverslurpd_pidfile=${ldapserver_statedir}/run/slurpd.pid ldapserver_schemadir=${sysconfdir}/openldap/schema ldapserver_confdir=${sysconfdir}/openldap # @l_musr@ @@ -136,8 +135,6 @@ webserver_errorlogfile=${webserver_logdir}/apache-error.log webserver_accesslogfile=${webserver_logdir}/apache-access.log webserver_confdir=${sysconfdir}/apache webserver_pidfile=${localstatedir}/apache/run/apache.pid -webserver_mime_magicfile=${sysconfdir}/apache/mime.magic -webserver_mime_typesfile=${sysconfdir}/apache/mime.types webserver_sslscache=${webserver_logdir}/ssl_scache webserver_sslmutex=${webserver_logdir}/ssl_mutex # webserver_web_prefix is empty indeed diff --git a/conf/dist/mandriva b/conf/dist/mandriva index 77db915..9e24586 100644 --- a/conf/dist/mandriva +++ b/conf/dist/mandriva @@ -136,8 +136,6 @@ webserver_errorlogfile=${webserver_logdir}/error_log webserver_accesslogfile=${webserver_logdir}/access_log webserver_confdir=${sysconfdir}/httpd/conf webserver_pidfile=${localstatedir}/run/httpd/httpd.pid -webserver_mime_magicfile=${sysconfdir}/httpd/conf/magic -webserver_mime_typesfile=${sysconfdir}/httpd/conf/mime.types webserver_sslscache=${webserver_logdir}/ssl_scache webserver_sslmutex=${webserver_logdir}/ssl_mutex webserver_web_prefix=/kolab diff --git a/conf/dist/suse b/conf/dist/suse index 0f5d782..1527012 100644 --- a/conf/dist/suse +++ b/conf/dist/suse @@ -120,8 +120,6 @@ webserver_errorlogfile=${webserver_logdir}/apache-error.log webserver_accesslogfile=${webserver_logdir}/apache-access.log webserver_confdir=${sysconfdir}/apache2 webserver_pidfile=${localstatedir}/apache/run/apache.pid -webserver_mime_magicfile=${sysconfdir}/apache2/magic -webserver_mime_typesfile=${sysconfdir}/apache2/mime.types webserver_sslscache=${webserver_logdir}/ssl_scache webserver_sslmutex=${webserver_logdir}/ssl_mutex webserver_web_prefix= diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in index 18f966c..0faa343 100644 --- a/conf/kolab.globals.in +++ b/conf/kolab.globals.in @@ -13,21 +13,28 @@ RPM : @RPM@ TAR : @TAR@ WITHOPENPKG : @WITHOPENPKG@ aliases_file : @aliases_file@ +amavisd_conffile : @amavisd_conffile@ +amavisd_grp : @amavisd_grp@ +amavisd_home : @amavisd_home@ +amavisd_logfile : @amavisd_logfile@ +amavisd_rusr : @amavisd_rusr@ +amavisd_templatedir : @amavisd_templatedir@ +amavisd_usr : @amavisd_usr@ backupdir : @backupdir@ backupfiles : @backupfiles@ bind_addr : 0.0.0.0 bind_any : TRUE bindir: @bindir@ calendar_id : calendar -conn_refresh_period : 60 clamav_confdir : @clamav_confdir@ -clamav_socket : @clamav_socket@ +clamav_datadir : @clamav_datadir@ +clamav_grp : @clamav_grp@ clamav_logfile : @clamav_logfile@ clamav_pidfile : @clamav_pidfile@ -clamav_datadir : @clamav_datadir@ clamav_rusr : @clamav_rusr@ +clamav_socket : @clamav_socket@ clamav_usr : @clamav_usr@ -clamav_grp : @clamav_grp@ +conn_refresh_period : 60 cyrus-admin : manager cyrus-admins : manager cyrus-autocreatequota : 100000 @@ -37,6 +44,7 @@ cyrus-pop3 : FALSE cyrus-pop3s : TRUE cyrus-sieve : TRUE debug : 0 +datadir : @datadir@ dimp_confdir: @dimp_confdir@ directory_mode : @directory_mode@ emailserver_confdir : @emailserver_confdir@ @@ -68,15 +76,15 @@ horde_confdir: @horde_confdir@ horde_cookie_path: @horde_cookie_path@ imap_confdir : @imap_confdir@ imap_confperm : @imap_confperm@ -imap_usr : @imap_usr@ imap_grp : @imap_grp@ +imap_lmtp : @imap_lmtp@ imap_masterlogfile : @imap_masterlogfile@ imap_misclogfile : @imap_misclogfile@ -imap_statedir : @imap_statedir@ -imap_spool : @imap_spool@ -imap_sievedir : @imap_sievedir@ -imap_lmtp : @imap_lmtp@ imap_notify_socket : @imap_notify_socket@ +imap_sievedir : @imap_sievedir@ +imap_spool : @imap_spool@ +imap_statedir : @imap_statedir@ +imap_usr : @imap_usr@ imappartitions_script : @sbindir@/kolab_imappartitions imp_confdir: @imp_confdir@ ingo_confdir: @ingo_confdir@ @@ -95,6 +103,8 @@ kolab_quotawarning: @kolab_quotawarning@ kolab_rgrp: @kolab_rgrp@ kolab_rusr: @kolab_rusr@ kolab_scriptsdir : @kolab_scriptsdir@ +kolab_smtpdpolicy_conffile_grp : @kolab_smtpdpolicy_conffile_grp@ +kolab_smtpdpolicy_conffile_usr : @kolab_smtpdpolicy_conffile_usr@ kolab_statedir: @kolab_statedir@ kolab_susr: @kolab_susr@ kolab_usr: @kolab_usr@ @@ -103,15 +113,24 @@ kolabconf_script: @kolabconf_script@ kolabdir: @sysconfdir@/kolab/ kronolith_confdir: @kronolith_confdir@ ldap_uri : ldap://127.0.0.1:389 +ldapserver_argsfile : @ldapserver_argsfile@ ldapserver_confdir : @ldapserver_confdir@ ldapserver_dir : @ldapserver_dir@ ldapserver_grp : @ldapserver_grp@ +ldapserver_logfile : @ldapserver_logfile@ ldapserver_modulepath : @ldapserver_modulepath@ +ldapserver_pidfile : @ldapserver_pidfile@ +ldapserver_replogfile : @ldapserver_replogfile@ ldapserver_rgrp : @ldapserver_rgrp@ ldapserver_rusr : @ldapserver_rusr@ +ldapserver_schemadir : @ldapserver_schemadir@ ldapserver_statedir : @ldapserver_statedir@ +ldapserver_usr : @ldapserver_usr@ +ldapserverslurpd_pidfile : @ldapserverslurpd_pidfile@ +libdir : @libdir@ libexecdir : @libexecdir@ local_addr : 127.0.0.1 +localstatedir : @localstatedir@ log_level : 2 mimp_confdir: @mimp_confdir@ mnemo_confdir: @mnemo_confdir@ @@ -134,6 +153,8 @@ resmgr_log_type: @resmgr_log_type@ resmgr_logdir: @resmgr_logdir@ resmgr_scriptsdir : @resmgr_scriptsdir@ resmgr_tmpdir: @resmgr_tmpdir@ +sasl_authdconffile : @sasl_authdconffile@ +sasl_logfile : @sasl_logfile@ sasl_smtpconffile : @sasl_smtpconffile@ sbindir: @sbindir@ sf_field_deleted : kolabdeleteflag @@ -145,6 +166,7 @@ slurpd_accept_addr : 127.0.0.1 slurpd_addr : 127.0.0.1 slurpd_port : 9999 smarty_compiledir : @smarty_compiledir@ +spamassassin_confdir : @spamassassin_confdir@ syncrepl_cookie_file : @kolab_statedir@/syncrepl_cookie sysconfdir : @sysconfdir@ syslog_facility : @syslog_facility@ @@ -158,9 +180,20 @@ user_field_modified : modifytimestamp user_field_quota : cyrus-userquota user_object_class : inetOrgPerson webclient_data_root: @webclient_data_root@ -webserver_document_root: @webserver_document_root@ -webserver_grp: @webserver_grp@ -webserver_logdir: @webserver_logdir@ -webserver_musr: @webserver_musr@ -webserver_usr: @webserver_usr@ +webserver_acceptlock : @webserver_acceptlock@ +webserver_accesslogfile : @webserver_accesslogfile@ +webserver_cgidir : @webserver_cgidir@ +webserver_confdir : @webserver_confdir@ +webserver_document_root : @webserver_document_root@ +webserver_errorlogfile : @webserver_errorlogfile@ +webserver_grp : @webserver_grp@ +webserver_logdir : @webserver_logdir@ +webserver_musr : @webserver_musr@ +webserver_pidfile : @webserver_pidfile@ +webserver_runtime_status : @webserver_runtime_status@ +webserver_sessions : @webserver_sessions@ +webserver_sslmutex : @webserver_sslmutex@ +webserver_sslscache : @webserver_sslscache@ +webserver_tmpdir : @webserver_tmpdir@ +webserver_usr : @webserver_usr@ webserver_web_prefix : @webserver_web_prefix@ diff --git a/conf/templates/DB_CONFIG.slapd.template.in b/conf/templates/DB_CONFIG.slapd.template index e85a8c1..378d463 100644 --- a/conf/templates/DB_CONFIG.slapd.template.in +++ b/conf/templates/DB_CONFIG.slapd.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@ldapserver_dir@/DB_CONFIG +TARGET=@@@ldapserver_dir@@@/DB_CONFIG PERMISSIONS=0640 -OWNERSHIP=@ldapserver_usr@:@ldapserver_rgrp@ -RUNONCHANGE=@KOLABRC@ rc openldap restart +OWNERSHIP=@@@ldapserver_usr@@@:@@@ldapserver_rgrp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc openldap restart KOLAB_META_END # (c) 2005 Klaraelvdalens Datakonsult AB # Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se> diff --git a/conf/templates/amavisd.conf.template.in b/conf/templates/amavisd.conf.template index d05cd30..ddd51f6 100644 --- a/conf/templates/amavisd.conf.template.in +++ b/conf/templates/amavisd.conf.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@amavisd_conffile@ +TARGET=@@@amavisd_conffile@@@ PERMISSIONS=0640 -OWNERSHIP=@amavisd_usr@:@amavisd_grp@ -RUNONCHANGE=@KOLABRC@ rc amavisd restart +OWNERSHIP=@@@amavisd_usr@@@:@@@amavisd_grp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc amavisd restart KOLAB_META_END @@@warning@@@ @@ -59,7 +59,7 @@ use strict; # $MYHOME serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. -$MYHOME = '@amavisd_home@'; +$MYHOME = '@@@amavisd_home@@@'; # $mydomain serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. @@ -71,14 +71,14 @@ $myhostname = '@@@fqdnhostname@@@'; # fqdn of this host, default by uname(3) # Set the user and group to which the daemon will change if started as root # (otherwise just keeps the UID unchanged, and these settings have no effect): -$daemon_user = q{@amavisd_rusr@}; # (no default; customary: vscan or amavis) -$daemon_group = q{@amavisd_grp@}; # (no default; customary: vscan or amavis) +$daemon_user = q{@@@amavisd_rusr@@@}; # (no default; customary: vscan or amavis) +$daemon_group = q{@@@amavisd_grp@@@}; # (no default; customary: vscan or amavis) # Runtime working directory (cwd), and a place where # temporary directories for unpacking mail are created. # (no trailing slash, may be a scratch file system) $TEMPBASE = $MYHOME; # (must be set if other config vars use is) -#$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir @amavisd_home@ clean? +#$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir @@@amavisd_home@@@ clean? # $helpers_home sets environment variable HOME, and is passed as option # 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory @@ -110,19 +110,19 @@ $notify_method = $forward_method; # where to submit notifications # SENDMAIL MILTER, using amavis-milter.c helper program: #$forward_method = undef; # no explicit forwarding, sendmail does it by itself # milter; option -odd is needed to avoid deadlocks -#$notify_method = 'pipe:flags=q argv=@sbindir@/sendmail -Ac -i -odd -f ${sender} -- ${recipient}'; +#$notify_method = 'pipe:flags=q argv=@@@sbindir@@@/sendmail -Ac -i -odd -f ${sender} -- ${recipient}'; # just a thought: can we use use -Am instead of -odd ? # SENDMAIL (old non-milter setup, as relay): -#$forward_method = 'pipe:flags=q argv=@sbindir@/sendmail -C@sysconfdir@/sendmail.orig.cf -i -f ${sender} -- ${recipient}'; +#$forward_method = 'pipe:flags=q argv=@@@sbindir@@@/sendmail -C@@@sysconfdir@@@/sendmail.orig.cf -i -f ${sender} -- ${recipient}'; #$notify_method = $forward_method; # SENDMAIL (old non-milter setup, amavis.c calls local delivery agent): #$forward_method = undef; # no explicit forwarding, amavis.c will call LDA -#$notify_method = 'pipe:flags=q argv=@sbindir@/sendmail -Ac -i -f ${sender} -- ${recipient}'; +#$notify_method = 'pipe:flags=q argv=@@@sbindir@@@/sendmail -Ac -i -f ${sender} -- ${recipient}'; # EXIM v3 (not recommended with v4 or later, which can use SMTP setup instead): -#$forward_method = 'pipe:flags=q argv=@sbindir@/exim -oMr scanned-ok -i -f ${sender} -- ${recipient}'; +#$forward_method = 'pipe:flags=q argv=@@@sbindir@@@/exim -oMr scanned-ok -i -f ${sender} -- ${recipient}'; #$notify_method = $forward_method; # prefer to collect mail for forwarding as BSMTP files? @@ -189,7 +189,7 @@ $child_timeout=5*60; # abort child if it does not complete each task in n sec # directly, or read from a file, one domain per line; comments and empty lines # are ignored, a dot before a domain name implies its subdomains: # -#read_hash(\%local_domains, '@amavisd_home@/local_domains'); +#read_hash(\%local_domains, '@@@amavisd_home@@@/local_domains'); #or alternatively(B), using a list of regular expressions: # $local_domains_re = new_RE( qr'[@.]example\.com$'i ); @@ -277,7 +277,7 @@ $DO_SYSLOG = 0; # (defaults to false) #$SYSLOG_LEVEL = 'user.info'; # (facility.priority, default 'mail.info') # Log file (if not using syslog) -$LOGFILE = "@amavisd_logfile@"; # (defaults to empty, no log) +$LOGFILE = "@@@amavisd_logfile@@@"; # (defaults to empty, no log) #NOTE: levels are not strictly observed and are somewhat arbitrary # 0: startup/exit/failure messages, viruses detected @@ -325,18 +325,18 @@ $log_templ = '[? %#V |[? %#F |[?%#D|Not-Delivered|Passed]|BANNED name/type (%F)] # or later; second argument is ignored otherwise. See PerlIO::encoding, # Encode::PerlIO and perluniintro man pages. # -# $notify_sender_templ = read_text('@amavisd_home@/notify_sender.txt'); -# $notify_virus_sender_templ= read_text('@amavisd_home@/notify_virus_sender.txt'); -# $notify_virus_admin_templ = read_text('@amavisd_home@/notify_virus_admin.txt'); -# $notify_virus_recips_templ= read_text('@amavisd_home@/notify_virus_recips.txt'); -# $notify_spam_sender_templ = read_text('@amavisd_home@/notify_spam_sender.txt'); -# $notify_spam_admin_templ = read_text('@amavisd_home@/notify_spam_admin.txt'); +# $notify_sender_templ = read_text('@@@amavisd_home@@@/notify_sender.txt'); +# $notify_virus_sender_templ= read_text('@@@amavisd_home@@@/notify_virus_sender.txt'); +# $notify_virus_admin_templ = read_text('@@@amavisd_home@@@/notify_virus_admin.txt'); +# $notify_virus_recips_templ= read_text('@@@amavisd_home@@@/notify_virus_recips.txt'); +# $notify_spam_sender_templ = read_text('@@@amavisd_home@@@/notify_spam_sender.txt'); +# $notify_spam_admin_templ = read_text('@@@amavisd_home@@@/notify_spam_admin.txt'); # If notification template files are collectively available in some directory, # use read_l10n_templates which calls read_text for each known template. # -read_l10n_templates('@amavisd_templatedir@/en_US'); -#read_l10n_templates('@amavisd_templatedir@/de'); +read_l10n_templates('@@@amavisd_templatedir@@@/en_US'); +#read_l10n_templates('@@@amavisd_templatedir@@@/de'); # Here is an overall picture (sequence of events) of how pieces fit together @@ -451,7 +451,7 @@ $warnbannedrecip = 1; # (defaults to false (undef)) # qr'tanatos|lentin|bridex|mimail|trojan\.dropper|dumaru|parite|spaces'i, # qr'dloader|galil|gibe|swen|netwatch|bics|sbrowse|sober|rox|val(hal)?la'i, # qr'frethem|sircam|be?agle|tanx|mydoom|novarg|shimg|netsky|somefool|moodown'i, -# qr'@mm|@MM', # mass mailing viruses as labeled by f-prot and @bindir@/uvscan +# qr'@mm|@MM', # mass mailing viruses as labeled by f-prot and @@@bindir@@@/uvscan # qr'Worm'i, # worms as labeled by ClamAV, Kaspersky, etc # [qr'^(EICAR|Joke\.|Junk\.)'i => 0], # [qr'^(WM97|OF97|W95/CIH-|JS/Fort)'i => 0], @@ -531,7 +531,7 @@ $mailfrom_to_quarantine = ''; # override sender address with null return path # or a directory (no trailing slash) # (the default value is undef, meaning no quarantine) # -$QUARANTINEDIR = '@amavisd_home@/virusmails'; +$QUARANTINEDIR = '@@@amavisd_home@@@/virusmails'; #$virus_quarantine_method = "local:virus-%i-%n"; # default #$spam_quarantine_method = "local:spam-%b-%i-%n"; # default @@ -963,7 +963,7 @@ $blacklist_sender_re = new_RE( # a hash lookup table can be read from a file, # one address per line, comments and empty lines are permitted: # -# read_hash(\%whitelist_sender, '@amavisd_home@/whitelist_sender'); +# read_hash(\%whitelist_sender, '@@@amavisd_home@@@/whitelist_sender'); # ... or set directly: @@ -1014,7 +1014,7 @@ map { $whitelist_sender{lc($_)}=1 } (qw( #$per_recip_whitelist_sender_lookup_tables = { # 'user@my.example.com' => [qw( friend@example.org .other.example.org )], # '.my1.example.com' => [qw( !foe.other.example,org .other.example,org )], -# '.my2.example.com' => read_hash('@amavisd_home@/my2-wl.dat'), +# '.my2.example.com' => read_hash('@@@amavisd_home@@@/my2-wl.dat'), # 'abuse@' => { 'postmaster@'=>1, # 'cert-advisory-owner@cert.org'=>1, 'owner-alert@iss.net'=>1 }, #}; @@ -1070,7 +1070,7 @@ $MAX_EXPANSION_FACTOR = 500; # times original mail size (must be specified) # NOTE: if $daemon_chroot_dir is nonempty, the directories will be # relative to the chroot directory specified; -$path = '@sbindir@:@bindir@:/usr/sbin:/sbin:/usr/bin:/bin'; +$path = '@@@sbindir@@@:@@@bindir@@@:/usr/sbin:/sbin:/usr/bin:/bin'; # Specify one string or a search list of strings (first match wins). # The string (or: each string in a list) may be an absolute path, @@ -1189,7 +1189,7 @@ $sa_spam_subject_tag = '***SPAM*** '; # (defaults to undef, disabled) # comment out its entry or use undef or '' as its program name/path # (second parameter). An example where this is almost a must: disable # Sophos 'sweep' if you have its daemonized version Sophie or SAVI-Perl -# (same for Trophie/vscan, and clamd/@bindir@/clamscan), or if another unrelated +# (same for Trophie/vscan, and clamd/@@@bindir@@@/clamscan), or if another unrelated # program happens to have a name matching one of the entries ('sweep' # again comes to mind); # @@ -1215,7 +1215,7 @@ $sa_spam_subject_tag = '***SPAM*** '; # (defaults to undef, disabled) ### http://www.clamav.net/ ['Clam Antivirus-clamd', - \&ask_daemon, ["CONTSCAN {}\n", "@clamav_socket@"], + \&ask_daemon, ["CONTSCAN {}\n", "@@@clamav_socket@@@"], qr/\bOK$/, qr/\bFOUND$/, qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], # NOTE: run clamd under the same user as amavisd; match the socket @@ -1272,12 +1272,12 @@ $sa_spam_subject_tag = '***SPAM*** '; # (defaults to undef, disabled) "-f=$TEMPBASE {}", [0,8,16,24], [2,3,4,5,6, 18,19,20,21,22], qr/infected: ([^\r\n]+)/ ], # change the startup-script in /etc/init.d/kavd to: - # DPARMS="-* -Y -dl -f=@amavisd_home@ @amavisd_home@" - # (or perhaps: DPARMS="-I0 -Y -* @localstatedir@/amavis" ) - # adjusting @localstatedir@/amavis above to match your $TEMPBASE. - # The '-f=@amavisd_home@' is needed if not running it as root, so it + # DPARMS="-* -Y -dl -f=@@@amavisd_home@@@ @@@amavisd_home@@@" + # (or perhaps: DPARMS="-I0 -Y -* @@@localstatedir@@@/amavis" ) + # adjusting @@@localstatedir@@@/amavis above to match your $TEMPBASE. + # The '-f=@@@amavisd_home@@@' is needed if not running it as root, so it # can find, read, and write its pid file, etc., see 'man kavdaemon'. - # defUnix.prf: there must be an entry "*@localstatedir@/amavis" (or whatever + # defUnix.prf: there must be an entry "*@@@localstatedir@@@/amavis" (or whatever # directory $TEMPBASE specifies) in the 'Names=' section. # cd /opt/AVP/DaemonClients; configure; cd Sample; make # cp AvpDaemonClient /opt/AVP/ @@ -1380,7 +1380,7 @@ $sa_spam_subject_tag = '***SPAM*** '; # (defaults to undef, disabled) # # (btw, assigning stdin to /dev/null causes RAV to fail) ### http://www.nai.com/ - ['NAI McAfee AntiVirus (@bindir@/uvscan)', '@bindir@/uvscan', + ['NAI McAfee AntiVirus (@@@bindir@@@/uvscan)', '@@@bindir@@@/uvscan', '--secure -rv --mime --summary --noboot - {}', [0], [13], qr/(?x) Found (?: \ the\ (.+)\ (?:virus|trojan) | @@ -1439,7 +1439,7 @@ $sa_spam_subject_tag = '***SPAM*** '; # (defaults to undef, disabled) @av_scanners_backup = ( ### http://www.clamav.net/ - ['Clam Antivirus - @bindir@/clamscan', '@bindir@/clamscan', + ['Clam Antivirus - @@@bindir@@@/clamscan', '@@@bindir@@@/clamscan', '--stdout --no-summary -r {}', [0], [1], qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], diff --git a/conf/templates/httpd.conf.template.in b/conf/templates/httpd.conf.template index 9a97fb4..13b5413 100644 --- a/conf/templates/httpd.conf.template.in +++ b/conf/templates/httpd.conf.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@webserver_confdir@/apache.conf +TARGET=@@@webserver_confdir@@@/apache.conf PERMISSIONS=0640 -OWNERSHIP=@webserver_usr@:@webserver_grp@ -RUNONCHANGE=@KOLABRC@ rc apache reload +OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc apache reload KOLAB_META_END # (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de> # (c) 2003 Martin Konold <martin.konold@erfrakon.de> @@ -13,14 +13,14 @@ KOLAB_META_END @@@warning@@@ ### Section 1: Global Environment -ServerRoot "@prefix@" +ServerRoot "@@@prefix@@@" # do not require SSL as default for now SSLVerifyClient none -#SSLCACertificateFile @sysconfdir@/kolab/server.pem -SSLSessionCache dbm:@webserver_sslscache@ +#SSLCACertificateFile @@@sysconfdir@@@/kolab/server.pem +SSLSessionCache dbm:@@@webserver_sslscache@@@ SSLSessionCacheTimeout 300 -SSLMutex file:@webserver_sslmutex@ +SSLMutex file:@@@webserver_sslmutex@@@ SSLRandomSeed startup builtin SSLRandomSeed connect builtin @@ -41,8 +41,8 @@ RewriteRule ^/freebusy/(.+)\.pxfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&ca <VirtualHost _default_:443> SSLEngine on SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL -SSLCertificateFile @sysconfdir@/kolab/cert.pem -SSLCertificateKeyFile @sysconfdir@/kolab/key.pem +SSLCertificateFile @@@sysconfdir@@@/kolab/cert.pem +SSLCertificateKeyFile @@@sysconfdir@@@/kolab/key.pem RewriteEngine On RewriteOptions inherit @@ -51,7 +51,7 @@ RewriteOptions inherit SSLOptions +StdEnvVars </Files> -<Directory "@webserver_cgidir@"> +<Directory "@@@webserver_cgidir@@@"> SSLOptions +StdEnvVars </Directory> @@ -59,22 +59,22 @@ RewriteOptions inherit #<IfModule !mpm_winnt.c> #<IfModule !mpm_netware.c> -#LockFile @webserver_acceptlock@ +#LockFile @@@webserver_acceptlock@@@ #</IfModule> #</IfModule> #<IfModule !mpm_netware.c> #<IfModule !perchild.c> -#ScoreBoardFile @webserver_runtime_status@ +#ScoreBoardFile @@@webserver_runtime_status@@@ #</IfModule> #</IfModule> #<IfModule !mpm_netware.c> -#PidFile @webserver_pidfile@ +#PidFile @@@webserver_pidfile@@@ #</IfModule> -User @webserver_usr@ -Group @webserver_grp@ +User @@@webserver_usr@@@ +Group @@@webserver_grp@@@ Timeout 300 KeepAlive On @@ -82,7 +82,7 @@ MaxKeepAliveRequests 100 KeepAliveTimeout 15 <IfModule mpm_prefork_module> -PidFile @webserver_pidfile@ +PidFile @@@webserver_pidfile@@@ StartServers 5 MinSpareServers 5 MaxSpareServers 10 @@ -123,14 +123,14 @@ Listen @@@bind_addr@@@:443 ServerAdmin root@localhost #ServerName new.host.name:80 UseCanonicalName Off -DocumentRoot "@webserver_document_root@" +DocumentRoot "@@@webserver_document_root@@@" <Directory /> Options FollowSymLinks AllowOverride None </Directory> -#<Directory "@webserver_document_root@"> +#<Directory "@@@webserver_document_root@@@"> # Options Indexes FollowSymLinks # AllowOverride None # Order allow,deny @@ -140,23 +140,23 @@ DocumentRoot "@webserver_document_root@" #DirectoryIndex index.html AccessFileName .htaccess -<Location "@webserver_web_prefix@/"> - ErrorDocument 403 https://@@@fqdnhostname@@@@kolab_wui@/ +<Location "@@@webserver_web_prefix@@@/"> + ErrorDocument 403 https://@@@fqdnhostname@@@@@@kolab_wui@@@/ </Location> -<Location "@kolab_wui@"> +<Location "@@@kolab_wui@@@"> SSLRequireSSL </Location> -<Location "@webserver_web_prefix@/client"> - ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/client/ +<Location "@@@webserver_web_prefix@@@/client"> + ErrorDocument 403 https://@@@fqdnhostname@@@@@@webserver_web_prefix@@@/client/ SSLRequireSSL </Location> -<Location "@webserver_web_prefix@/fbview"> - ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/fbview/ +<Location "@@@webserver_web_prefix@@@/fbview"> + ErrorDocument 403 https://@@@fqdnhostname@@@@@@webserver_web_prefix@@@/fbview/ SSLRequireSSL </Location> @@@if apache-http@@@ @@@else@@@ -<Location "@webserver_web_prefix@/freebusy"> +<Location "@@@webserver_web_prefix@@@/freebusy"> SSLRequireSSL </Location> @@@endif@@@ @@ -174,35 +174,35 @@ Redirect /horde https://@@@fqdnhostname@@@/client TypesConfig etc/apache/mime.types DefaultType text/plain <IfModule mime_magic_module> - MIMEMagicFile @webserver_confdir@/mime.magic + MIMEMagicFile @@@webserver_confdir@@@/mime.magic </IfModule> HostnameLookups On -ErrorLog @webserver_errorlogfile@ +ErrorLog @@@webserver_errorlogfile@@@ LogLevel warn LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%h %l %u %t \"%r\" %>s %b" common LogFormat "%{Referer}i -> %U" referer LogFormat "%{User-agent}i" agent -CustomLog @webserver_accesslogfile@ common +CustomLog @@@webserver_accesslogfile@@@ common ServerTokens Full ServerSignature On -Alias /icons/ "@webserver_document_root@/icons/" +Alias /icons/ "@@@webserver_document_root@@@/icons/" -Alias /public-cal/ics "@webserver_document_root@/client/kronolith/ics_kolab.php" +Alias /public-cal/ics "@@@webserver_document_root@@@/client/kronolith/ics_kolab.php" -<Directory "@webserver_document_root@/icons"> +<Directory "@@@webserver_document_root@@@/icons"> Options Indexes MultiViews AllowOverride None Order allow,deny Allow from all </Directory> -ScriptAlias /cgi-bin/ "@webserver_document_root@/cgi-bin/" +ScriptAlias /cgi-bin/ "@@@webserver_document_root@@@/cgi-bin/" -<Directory "@webserver_document_root@/cgi-bin"> +<Directory "@@@webserver_document_root@@@/cgi-bin"> AllowOverride None Options None Order allow,deny @@ -222,7 +222,7 @@ ScriptAlias /cgi-bin/ "@webserver_document_root@/cgi-bin/" AuthzLDAPAuthoritative off </AuthnProviderAlias> -<Directory "@webserver_document_root@/freebusy"> +<Directory "@@@webserver_document_root@@@/freebusy"> AllowOverride None Options None # Disallow for everyone as default @@ -241,17 +241,17 @@ ScriptAlias /cgi-bin/ "@webserver_document_root@/cgi-bin/" AddDefaultCharset Off </Directory> -<Directory "@webserver_document_root@/client"> +<Directory "@@@webserver_document_root@@@/client"> AllowOverride All Allow from all </Directory> -<Directory "@webserver_document_root@/fbview"> +<Directory "@@@webserver_document_root@@@/fbview"> AllowOverride All Allow from all </Directory> -<Directory "@webserver_document_root@@kolab_wui@"> +<Directory "@@@webserver_document_root@@@@@@kolab_wui@@@"> AllowOverride None Options None Order allow,deny @@ -356,7 +356,7 @@ AddCharset EUC-JP .euc-jp AddCharset EUC-KR .euc-kr AddCharset shift_jis .sjis -LoadModule php5_module @libexecdir@/apache/mod_php.so +LoadModule php5_module @@@libexecdir@@@/apache/mod_php.so AddType application/x-tar .tgz AddType application/x-httpd-php .php .php4 .php3 .html AddType image/x-icon .ico @@ -373,5 +373,5 @@ BrowserMatch "^WebDrive" redirect-carefully BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully # used for local non Kolab extension -Include @webserver_confdir@/apache.local -Include @webserver_confdir@/*.include +Include @@@webserver_confdir@@@/apache.local +Include @@@webserver_confdir@@@/*.include diff --git a/conf/templates/httpd.local.template.in b/conf/templates/httpd.local.template index d839d42..b9bef49 100644 --- a/conf/templates/httpd.local.template.in +++ b/conf/templates/httpd.local.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@webserver_confdir@/apache.local +TARGET=@@@webserver_confdir@@@/apache.local PERMISSIONS=0640 -OWNERSHIP=@webserver_musr@:@webserver_grp@ -RUNONCHANGE=@KOLABRC@ rc apache reload +OWNERSHIP=@@@webserver_musr@@@:@@@webserver_grp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc apache reload KOLAB_META_END # (c) 2004 Martin Konold <martin.konold@erfrakon.de> # This program is Free Software under the GNU General Public License (>=v2). @@ -15,16 +15,16 @@ KOLAB_META_END # configuration file (apache.conf) # e.g. -# ScriptAlias /nagios/cgi-bin/ @libdir@/nagios/cgi/ -#<Directory "@libdir@/nagios/cgi/"> +# ScriptAlias /nagios/cgi-bin/ @@@libdir@@@/nagios/cgi/ +#<Directory "@@@libdir@@@/nagios/cgi/"> # AllowOverride AuthConfig # Options ExecCGI # Order allow,deny # Allow from all #</Directory> # -#Alias /nagios/ @datadir@/nagios/ -#<Directory "@datadir@/nagios/"> +#Alias /nagios/ @@@datadir@@@/nagios/ +#<Directory "@@@datadir@@@/nagios/"> # Options None # AllowOverride AuthConfig # Order allow,deny diff --git a/conf/templates/kolab.conf.template.in b/conf/templates/kolab.conf.template index 7051aaa..7051aaa 100644 --- a/conf/templates/kolab.conf.template.in +++ b/conf/templates/kolab.conf.template diff --git a/conf/templates/kolab_smtpdpolicy.conf.template.in b/conf/templates/kolab_smtpdpolicy.conf.template index 46dc421..73d11a4 100644 --- a/conf/templates/kolab_smtpdpolicy.conf.template.in +++ b/conf/templates/kolab_smtpdpolicy.conf.template @@ -1,7 +1,7 @@ KOLAB_META_START -TARGET=@sysconfdir@/kolab/kolab_smtpdpolicy.conf +TARGET=@@@sysconfdir@@@/kolab/kolab_smtpdpolicy.conf PERMISSIONS=0640 -OWNERSHIP=@kolab_smtpdpolicy_conffile_usr@:@kolab_smtpdpolicy_conffile_grp@ +OWNERSHIP=@@@kolab_smtpdpolicy_conffile_usr@@@:@@@kolab_smtpdpolicy_conffile_grp@@@ KOLAB_META_END # (c) 2005 Steffen Hansen <steffen@klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB) # diff --git a/conf/templates/ldap.conf.template.in b/conf/templates/ldap.conf.template index 74214ab..c797a63 100644 --- a/conf/templates/ldap.conf.template.in +++ b/conf/templates/ldap.conf.template @@ -1,7 +1,7 @@ KOLAB_META_START -TARGET=@ldapserver_confdir@/ldap.conf +TARGET=@@@ldapserver_confdir@@@/ldap.conf PERMISSIONS=0644 -OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@ +OWNERSHIP=@@@ldapserver_usr@@@:@@@ldapserver_grp@@@ KOLAB_META_END # (c) 2004 Klaraelvdalens Datakonsult AB # This program is Free Software under the GNU General Public License (>=v2). diff --git a/conf/templates/local.cf.template.in b/conf/templates/local.cf.template index 3a5ccd0..2dc91fb 100644 --- a/conf/templates/local.cf.template.in +++ b/conf/templates/local.cf.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@spamassassin_confdir@/local.cf +TARGET=@@@spamassassin_confdir@@@/local.cf PERMISSIONS=0644 -OWNERSHIP=@amavisd_usr@:@amavisd_grp@ -RUNONCHANGE=@KOLABRC@ rc amavisd restart +OWNERSHIP=@@@amavisd_usr@@@:@@@amavisd_grp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc amavisd restart KOLAB_META_END # (c) 2008 Intevation GmbH # This program is Free Software under the GNU General Public License (>=v2). @@ -11,7 +11,7 @@ KOLAB_META_END @@@warning@@@ ## -## @spamassassin_confdir@/local.cf -- site-wide defaults for SpamAssassin +## @@@spamassassin_confdir@@@/local.cf -- site-wide defaults for SpamAssassin ## (see 'perldoc Mail::SpamAssassin::Conf' for details of what can be tweaked) ## diff --git a/conf/templates/php.ini.template.in b/conf/templates/php.ini.template index 38e1775..dda021d 100644 --- a/conf/templates/php.ini.template.in +++ b/conf/templates/php.ini.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@phpini_dir@/php.ini +TARGET=@@@phpini_dir@@@/php.ini PERMISSIONS=0640 -OWNERSHIP=@webserver_musr@:@webserver_grp@ -RUNONCHANGE=@KOLABRC@ rc apache reload +OWNERSHIP=@@@webserver_musr@@@:@@@webserver_grp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc apache reload COMMENT_CHAR=; KOLAB_META_END @@@warning@@@ @@ -29,12 +29,12 @@ magic_quotes_gpc = 0 ; Automatically quote posted variables. Required to ; will be the default then. error_reporting = E_ALL & ~E_DEPRECATED -error_log = @webserver_logdir@/php/php-errors.log -upload_tmp_dir = @webserver_tmpdir@ +error_log = @@@webserver_logdir@@@/php/php-errors.log +upload_tmp_dir = @@@webserver_tmpdir@@@ ; Include Paths ;include_path = ".:/kolab/lib/php" -include_path = ".:@phplibdir@:@phplibdir2@:@phppeardir@" +include_path = ".:@@@phplibdir@@@" ; FIXME: Do not hardcode the timezone setting ; @@ -47,4 +47,4 @@ include_path = ".:@phplibdir@:@phplibdir2@:@phppeardir@" date.timezone = Europe/Berlin [Session] -session.save_path = @webserver_sessions@ +session.save_path = @@@webserver_sessions@@@ diff --git a/conf/templates/rc.conf.template.in b/conf/templates/rc.conf.template index be30ada..2490b73 100644 --- a/conf/templates/rc.conf.template.in +++ b/conf/templates/rc.conf.template @@ -1,7 +1,7 @@ KOLAB_META_START -TARGET=@sysconfdir@/rc.conf +TARGET=@@@sysconfdir@@@/rc.conf PERMISSIONS=0644 -OWNERSHIP=@kolab_musr@:@kolab_mgrp@ +OWNERSHIP=@@@kolab_musr@@@:@@@kolab_mgrp@@@ KOLAB_META_END # (c) 2004 Steffen Hansen <steffen@klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB) # diff --git a/conf/templates/saslauthd.conf.template.in b/conf/templates/saslauthd.conf.template index 11c7de5..94b478a 100644 --- a/conf/templates/saslauthd.conf.template.in +++ b/conf/templates/saslauthd.conf.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@sasl_authdconffile@ +TARGET=@@@sasl_authdconffile@@@ PERMISSIONS=0600 -OWNERSHIP=@kolab_musr@:@kolab_mgrp@ -RUNONCHANGE=@KOLABRC@ rc sasl restart +OWNERSHIP=@@@kolab_musr@@@:@@@kolab_mgrp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc sasl restart KOLAB_META_END # (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de> # (c) 2003 Martin Konold <martin.konold@erfrakon.de> diff --git a/conf/templates/slapd.access.template.in b/conf/templates/slapd.access.template index f1bba36..9ce5f2a 100644 --- a/conf/templates/slapd.access.template.in +++ b/conf/templates/slapd.access.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@ldapserver_confdir@/slapd.access +TARGET=@@@ldapserver_confdir@@@/slapd.access PERMISSIONS=0640 -OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@ -RUNONCHANGE=@KOLABRC@ rc openldap restart +OWNERSHIP=@@@ldapserver_usr@@@:@@@ldapserver_grp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc openldap restart KOLAB_META_END ## Copyright (c) 2005 Klaraelvdalens Datakonsult AB ## Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se> diff --git a/conf/templates/slapd.conf.template.in b/conf/templates/slapd.conf.template index dd6cd21..075028a 100644 --- a/conf/templates/slapd.conf.template.in +++ b/conf/templates/slapd.conf.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@ldapserver_confdir@/slapd.conf +TARGET=@@@ldapserver_confdir@@@/slapd.conf PERMISSIONS=0640 -OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@ -RUNONCHANGE=@KOLABRC@ rc openldap restart +OWNERSHIP=@@@ldapserver_usr@@@:@@@ldapserver_grp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc openldap restart KOLAB_META_END # (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de> # (c) 2003-2007 Martin Konold <martin.konold@erfrakon.de> @@ -13,7 +13,7 @@ KOLAB_META_END @@@warning@@@ @@@if ldapserver_modulepath@@@ -modulepath @ldapserver_modulepath@ +modulepath @@@ldapserver_modulepath@@@ moduleload back_bdb moduleload back_monitor moduleload refint @@ -21,12 +21,12 @@ moduleload unique @@@endif@@@ # manual additions are lost unless made to the template in the Kolab config directory -# the template is @sysconfdir@/kolab/templates/slapd.conf.template +# the template is @@@sysconfdir@@@/kolab/templates/slapd.conf.template -include @ldapserver_schemadir@/core.schema -include @ldapserver_schemadir@/cosine.schema -include @ldapserver_schemadir@/inetorgperson.schema -include @ldapserver_schemadir@/kolab2.schema +include @@@ldapserver_schemadir@@@/core.schema +include @@@ldapserver_schemadir@@@/cosine.schema +include @@@ldapserver_schemadir@@@/inetorgperson.schema +include @@@ldapserver_schemadir@@@/kolab2.schema # Only include this in case you need the calFBURL attribute in # kolabInetOrgPerson objects. @@ -34,7 +34,7 @@ include @ldapserver_schemadir@/kolab2.schema # # The schema remains available at # /kolab/var/kolab/www/client/turba/scripts/ldap/rfc2739.schema -#include @ldapserver_schemadir@/rfc2739.schema +#include @@@ldapserver_schemadir@@@/rfc2739.schema # Only include this in case you want to store the preferences of the # kolab web client in LDAP. @@ -42,10 +42,10 @@ include @ldapserver_schemadir@/kolab2.schema # # The schema remains available at # /kolab/var/kolab/www/client/scripts/ldap/horde.schema -#include @ldapserver_schemadir@/horde.schema +#include @@@ldapserver_schemadir@@@/horde.schema -pidfile @ldapserver_pidfile@ -argsfile @ldapserver_argsfile@ +pidfile @@@ldapserver_pidfile@@@ +argsfile @@@ldapserver_argsfile@@@ @@@if directory_replication_mode_is_syncrepl@@@ # Depending on the build options of openldap the syncprov module is statically @@ -58,18 +58,18 @@ moduleload syncprov # moduleload syncprov @@@endif@@@ @@@else@@@ -replica-pidfile @ldapserverslurpd_pidfile@ -replogfile @ldapserver_replogfile@ +replica-pidfile @@@ldapserverslurpd_pidfile@@@ +replogfile @@@ldapserver_replogfile@@@ replicationinterval 5 @@@endif@@@ @@@if bootstrap_config@@@ @@@else@@@ -TLSCertificateFile @sysconfdir@/kolab/cert.pem -TLSCertificateKeyFile @sysconfdir@/kolab/key.pem +TLSCertificateFile @@@sysconfdir@@@/kolab/cert.pem +TLSCertificateKeyFile @@@sysconfdir@@@/kolab/key.pem @@@endif@@@ -rootDSE @sysconfdir@/kolab/rootDSE.ldif +rootDSE @@@sysconfdir@@@/kolab/rootDSE.ldif defaultsearchbase "@@@base_dn@@@" @@ -100,7 +100,7 @@ index entryUUID eq dirtyread -directory @ldapserver_dir@ +directory @@@ldapserver_dir@@@ rootdn "@@@bind_dn@@@" rootpw "@@@bind_pw_hash@@@" @@ -132,7 +132,7 @@ index kolabHomeServer pres,eq index kolabDeleteflag pres,eq index member pres,eq -include @ldapserver_confdir@/slapd.access +include @@@ldapserver_confdir@@@/slapd.access access to dn="@@@base_dn@@@" attrs=children by group/kolabGroupOfNames="cn=admin,cn=internal,@@@base_dn@@@" write @@ -241,7 +241,7 @@ access to * by group/kolabGroupOfNames="cn=maintainer,cn=internal,@@@base_dn@@@" write by * read stop -include @ldapserver_confdir@/slapd.replicas +include @@@ldapserver_confdir@@@/slapd.replicas database monitor diff --git a/conf/templates/slapd.replicas.template.in b/conf/templates/slapd.replicas.template index 853eea8..a6cdf2b 100644 --- a/conf/templates/slapd.replicas.template.in +++ b/conf/templates/slapd.replicas.template @@ -1,8 +1,8 @@ KOLAB_META_START -TARGET=@ldapserver_confdir@/slapd.replicas +TARGET=@@@ldapserver_confdir@@@/slapd.replicas PERMISSIONS=0640 -OWNERSHIP=@ldapserver_usr@:@ldapserver_grp@ -RUNONCHANGE=@KOLABRC@ rc openldap restart +OWNERSHIP=@@@ldapserver_usr@@@:@@@ldapserver_grp@@@ +RUNONCHANGE=@@@KOLABRC@@@ rc openldap restart KOLAB_META_END ## Copyright (c) 2004 Klaraelvdalens Datakonsult AB ## Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se> |