replay c45d6c8fa116 with renames recorded

8 files changed, 83 insertions, 69 deletions

diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index dd12686..18f966c 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -8,9 +8,11 @@
 #=================================================================
 KOLABRC: @KOLABRC@
 LDAPD : @LDAPD@
+PHP : @PHP@
 RPM : @RPM@
 TAR : @TAR@
 WITHOPENPKG : @WITHOPENPKG@
+aliases_file : @aliases_file@
 backupdir : @backupdir@
 backupfiles : @backupfiles@
 bind_addr : 0.0.0.0
@@ -65,6 +67,16 @@ hashmethod: @sbindir@/slappasswd -s
 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_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@
 imappartitions_script : @sbindir@/kolab_imappartitions
 imp_confdir: @imp_confdir@
 ingo_confdir: @ingo_confdir@
@@ -106,6 +118,7 @@ mnemo_confdir: @mnemo_confdir@
 nag_confdir: @nag_confdir@
 passwd_confdir: @passwd_confdir@
 pear_horde_pkgs : @pear_horde_pkgs@
+phpini_dir : @phpini_dir@
 phplibdir : @phplibdir@
 phplibdir2 : @phplibdir2@
 pki_grp : @pki_grp@
@@ -119,6 +132,7 @@ resmgr_locksdir: @resmgr_locksdir@
 resmgr_log_name: @resmgr_log_name@
 resmgr_log_type: @resmgr_log_type@
 resmgr_logdir: @resmgr_logdir@
+resmgr_scriptsdir : @resmgr_scriptsdir@
 resmgr_tmpdir: @resmgr_tmpdir@
 sasl_smtpconffile : @sasl_smtpconffile@
 sbindir: @sbindir@
diff --git a/conf/templates/cyrus.conf.template.in b/conf/templates/cyrus.conf.template
index cf12c64..51111be 100644
--- a/conf/templates/cyrus.conf.template.in
+++ b/conf/templates/cyrus.conf.template
@@ -1,8 +1,8 @@
 KOLAB_META_START
-TARGET=@imap_confdir@/cyrus.conf
+TARGET=@@@imap_confdir@@@/cyrus.conf
 PERMISSIONS=0640
-OWNERSHIP=@imap_usr@:@imap_grp@
-RUNONCHANGE=@KOLABRC@ rc imapd reload
+OWNERSHIP=@@@imap_usr@@@:@@@imap_grp@@@
+RUNONCHANGE=@@@KOLABRC@@@ rc imapd reload
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
 # (c) 2003 Martin Konold <martin.konold@erfrakon.de>
@@ -26,21 +26,21 @@ START {
 # UNIX sockets start with a slash and are put into /openpkg/var/imapd/sockets
 SERVICES {
 @@@if cyrus-imap@@@
-  imap cmd="imapd -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:143" prefork=0
+  imap cmd="imapd -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:143" prefork=0
 @@@else@@@
-  imap cmd="imapd -C @imap_confdir@/imapd.conf" listen="@@@local_addr@@@:143" prefork=0
+  imap cmd="imapd -C @@@imap_confdir@@@/imapd.conf" listen="@@@local_addr@@@:143" prefork=0
 @@@endif@@@
 @@@if cyrus-imaps@@@
-  imaps cmd="imapd -s -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:993" prefork=0
+  imaps cmd="imapd -s -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:993" prefork=0
 @@@endif@@@
 @@@if cyrus-pop3@@@
-  pop3 cmd="pop3d -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:110" prefork=0
+  pop3 cmd="pop3d -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:110" prefork=0
 @@@endif@@@
 @@@if cyrus-pop3s@@@
-  pop3s cmd="pop3d -s -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:995" prefork=0
+  pop3s cmd="pop3d -s -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:995" prefork=0
 @@@endif@@@
 @@@if cyrus-sieve@@@
-  sieve cmd="timsieved -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:2000" prefork=0
+  sieve cmd="timsieved -C @@@imap_confdir@@@/imapd.conf" listen="@@@bind_addr@@@:2000" prefork=0
 @@@endif@@@
 
 #@@@if is-master@@@
@@ -48,11 +48,11 @@ SERVICES {
 #@@@endif@@@
 
   # LMTP is required for delivery
-  lmtpunix	cmd="lmtpd" listen="@emailserver_socket@" prefork=0
+  lmtpunix	cmd="lmtpd" listen="@@@emailserver_socket@@@" prefork=0
   lmtp          cmd="lmtpd -a" listen="@@@local_addr@@@:2003"
 
   # this is only necessary if using notifications
-  notifyd	cmd="notifyd" listen="@imap_notify_socket@" proto="udp" prefork=1
+  notifyd	cmd="notifyd" listen="@@@imap_notify_socket@@@" proto="udp" prefork=1
 }
 
 EVENTS {
diff --git a/conf/templates/imapd.annotation_definitions.template.in b/conf/templates/imapd.annotation_definitions.template
index 3b2bf5e..e89b932 100644
--- a/conf/templates/imapd.annotation_definitions.template.in
+++ b/conf/templates/imapd.annotation_definitions.template
@@ -1,8 +1,8 @@
 KOLAB_META_START
-TARGET=@imap_confdir@/imapd.annotation_definitions
+TARGET=@@@imap_confdir@@@/imapd.annotation_definitions
 PERMISSIONS=0640
-OWNERSHIP=@imap_usr@:@imap_grp@
-RUNONCHANGE=@KOLABRC@ rc imapd restart
+OWNERSHIP=@@@imap_usr@@@:@@@imap_grp@@@
+RUNONCHANGE=@@@KOLABRC@@@ rc imapd restart
 KOLAB_META_END
 /vendor/kolab/folder-test,mailbox,string,backend,value.shared value.priv,a
 /vendor/kolab/folder-type,mailbox,string,backend,value.shared value.priv,a
diff --git a/conf/templates/imapd.conf.template.in b/conf/templates/imapd.conf.template
index 583c861..66130d0 100644
--- a/conf/templates/imapd.conf.template.in
+++ b/conf/templates/imapd.conf.template
@@ -1,8 +1,8 @@
 KOLAB_META_START
-TARGET=@imap_confdir@/imapd.conf
+TARGET=@@@imap_confdir@@@/imapd.conf
 PERMISSIONS=0640
-OWNERSHIP=@imap_usr@:@imap_grp@
-RUNONCHANGE=@KOLABRC@ rc imapd restart
+OWNERSHIP=@@@imap_usr@@@:@@@imap_grp@@@
+RUNONCHANGE=@@@KOLABRC@@@ rc imapd restart
 KOLAB_META_END
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
 # (c) 2003-2006 Martin Konold <martin.konold@erfrakon.de>
@@ -13,14 +13,14 @@ KOLAB_META_END
 @@@warning@@@
 
 #   Warning: Do not use a trailing slash in paths!
-configdirectory:        @imap_statedir@
-partition-default:      @imap_spool@
+configdirectory:        @@@imap_statedir@@@
+partition-default:      @@@imap_spool@@@
 
 allowusermoves:         0
 admins:                 @@@cyrus-admins|join( )@@@
 sasl_pwcheck_method:    saslauthd
 sasl_mech_list: 	plain
-sendmail:               @sbindir@/sendmail
+sendmail:               @@@sbindir@@@/sendmail
 allowanonymouslogin:    no
 allowplaintext:         yes
 servername:             @@@fqdnhostname@@@
@@ -29,14 +29,14 @@ munge8bit: 		no
 quotawarn:              @@@cyrus-quotawarn@@@
 lmtp_over_quota_perm_failure: 1
 timeout:                30
-sievedir:		@imap_sievedir@
-lmtpsocket: 		@emailserver_socket@
+sievedir:		@@@imap_sievedir@@@
+lmtpsocket: 		@@@emailserver_socket@@@
 
 allowapop:              no
 
-#tls_ca_file: 		@sysconfdir@/kolab/server.pem
-tls_cert_file: 		@sysconfdir@/kolab/cert.pem
-tls_key_file: 		@sysconfdir@/kolab/key.pem
+#tls_ca_file: 		@@@sysconfdir@@@/kolab/server.pem
+tls_cert_file: 		@@@sysconfdir@@@/kolab/cert.pem
+tls_key_file: 		@@@sysconfdir@@@/kolab/key.pem
 
 altnamespace:           0
 unixhierarchysep:       yes
@@ -72,7 +72,7 @@ userprefix: user
 sharedprefix: shared
 
 # add support for sieve based notifications
-notifysocket: @imap_notify_socket@
+notifysocket: @@@imap_notify_socket@@@
 sievenotifier: mailto
 mailnotifier: mailto
 
@@ -93,4 +93,4 @@ duplicatesuppression: 0
 imapidlepoll: 5
 
 # Load definitions for vendor annotations
-annotation_definitions: @imap_confdir@/imapd.annotation_definitions
+annotation_definitions: @@@imap_confdir@@@/imapd.annotation_definitions
diff --git a/conf/templates/imapd.group.template.in b/conf/templates/imapd.group.template
index 3e182bb..b632d6b 100644
--- a/conf/templates/imapd.group.template.in
+++ b/conf/templates/imapd.group.template
@@ -1,7 +1,7 @@
 KOLAB_META_START
-TARGET=@imap_confdir@/imapd.group
+TARGET=@@@imap_confdir@@@/imapd.group
 PERMISSIONS=0640
-OWNERSHIP=@imap_usr@:@imap_grp@
+OWNERSHIP=@@@imap_usr@@@:@@@imap_grp@@@
 KOLAB_META_END
 ##  Copyright (c) 2003 Martin Konold <martin.konold@erfrakon.de>
 ##  Copyright (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
diff --git a/conf/templates/main.cf.template.in b/conf/templates/main.cf.template
index 3c56fdb..e5e511b 100644
--- a/conf/templates/main.cf.template.in
+++ b/conf/templates/main.cf.template
@@ -1,8 +1,8 @@
 KOLAB_META_START
-TARGET=@emailserver_confdir@/main.cf
+TARGET=@@@emailserver_confdir@@@/main.cf
 PERMISSIONS=0644
-OWNERSHIP=@emailserver_usr@:@emailserver_grp@
-RUNONCHANGE=@KOLABRC@ rc postfix reload
+OWNERSHIP=@@@emailserver_usr@@@:@@@emailserver_grp@@@
+RUNONCHANGE=@@@KOLABRC@@@ rc postfix reload
 KOLAB_META_END
 # (c) 2004 Steffen Hansen <steffen@klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
@@ -22,14 +22,14 @@ message_size_limit = 20971520
 @@@endif@@@
 
 #   paths
-command_directory = @sbindir@
-daemon_directory = @libexecdir@/postfix
-queue_directory = @emailserver_localstatedir@
+command_directory = @@@sbindir@@@
+daemon_directory = @@@libexecdir@@@/postfix
+queue_directory = @@@emailserver_localstatedir@@@
 
 #   users
-mail_owner= @emailserver_mail_owner@
-setgid_group= @emailserver_setgid_grp@
-default_privs= @emailserver_default_privs@
+mail_owner= @@@emailserver_mail_owner@@@
+setgid_group= @@@emailserver_setgid_grp@@@
+default_privs= @@@emailserver_default_privs@@@
 
 #   local host
 myhostname = @@@fqdnhostname@@@
@@ -77,14 +77,14 @@ relay_domains =
 recipient_delimiter = +
 
 #   maps
-canonical_maps = hash:@emailserver_confdir@/canonical
-virtual_alias_maps =  hash:@emailserver_confdir@/virtual, 
-	ldap:@emailserver_confdir@/ldapdistlist.cf, 
-	ldap:@emailserver_confdir@/ldapvirtual.cf
-relocated_maps = hash:@emailserver_confdir@/relocated
-transport_maps = hash:@emailserver_confdir@/transport, ldap:@emailserver_confdir@/ldaptransport.cf
-alias_maps = hash:@aliases_file@
-alias_database = hash:@aliases_file@
+canonical_maps = hash:@@@emailserver_confdir@@@/canonical
+virtual_alias_maps =  hash:@@@emailserver_confdir@@@/virtual, 
+	ldap:@@@emailserver_confdir@@@/ldapdistlist.cf, 
+	ldap:@@@emailserver_confdir@@@/ldapvirtual.cf
+relocated_maps = hash:@@@emailserver_confdir@@@/relocated
+transport_maps = hash:@@@emailserver_confdir@@@/transport, ldap:@@@emailserver_confdir@@@/ldaptransport.cf
+alias_maps = hash:@@@aliases_file@@@
+alias_database = hash:@@@aliases_file@@@
 #virtual_mailbox_maps = $virtual_alias_maps
 local_recipient_maps = $virtual_alias_maps, $alias_maps
 
@@ -92,7 +92,7 @@ local_recipient_maps = $virtual_alias_maps, $alias_maps
 disable_mime_input_processing = yes
 
 # enable header_checks (not for attachment headers):
-header_checks = regexp:@emailserver_confdir@/header_checks
+header_checks = regexp:@@@emailserver_confdir@@@/header_checks
 # disable_mime_input_processing = yes already implies that attachment headers
 # are not being checked, but just to be sure:
 mime_header_checks =
@@ -110,18 +110,18 @@ smtpd_use_tls = yes
 smtpd_tls_auth_only = yes
 smtpd_starttls_timeout = 300s
 smtpd_timeout = 300s
-#smtpd_tls_CAfile = @sysconfdir@/kolab/server.pem
+#smtpd_tls_CAfile = @@@sysconfdir@@@/kolab/server.pem
 #smtpd_tls_CApath =
 #smtpd_tls_ask_ccert = no
 #smtpd_tls_ccert_verifydepth = 5
-smtpd_tls_cert_file = @sysconfdir@/kolab/cert.pem
+smtpd_tls_cert_file = @@@sysconfdir@@@/kolab/cert.pem
 #smtpd_tls_cipherlist =
 #smtpd_tls_dcert_file =
 #smtpd_tls_dh1024_param_file =
 #smtpd_tls_dh512_param_file =
 #smtpd_tls_dkey_file = $smtpd_tls_dcert_file
 #smtpd_tls_key_file = $smtpd_tls_cert_file
-smtpd_tls_key_file = @sysconfdir@/kolab/key.pem
+smtpd_tls_key_file = @@@sysconfdir@@@/kolab/key.pem
 smtpd_tls_loglevel = 1
 smtpd_tls_received_header = no
 #smtpd_tls_req_ccert = no
diff --git a/conf/templates/master.cf.template.in b/conf/templates/master.cf.template
index cc0acab..884bf86 100644
--- a/conf/templates/master.cf.template.in
+++ b/conf/templates/master.cf.template
@@ -1,8 +1,8 @@
 KOLAB_META_START
-TARGET=@emailserver_confdir@/master.cf
+TARGET=@@@emailserver_confdir@@@/master.cf
 PERMISSIONS=0640
-OWNERSHIP=@emailserver_usr@:@emailserver_grp@
-RUNONCHANGE=@KOLABRC@ rc postfix reload
+OWNERSHIP=@@@emailserver_usr@@@:@@@emailserver_grp@@@
+RUNONCHANGE=@@@KOLABRC@@@ rc postfix reload
 KOLAB_META_END
 # (c) 2004 Steffen Hansen <steffen@klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
 # (c) 2003 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
@@ -46,11 +46,11 @@ local     unix  -       n       n       -       -       local
 lmtp      unix  -       -       n       -       -       lmtp
 anvil     unix  -       -       n       -       1       anvil
 scache    unix  -       -       n       -       1       scache
-#maildrop unix  -       n       n       -       -       pipe flags=DRhu user=vmail argv=@bindir@/maildrop -d ${recipient}
-#cyrus    unix  -       n       n       -       -       pipe user=cyrus argv=@bindir@/cyrdeliver -e -r ${sender} -m ${extension} ${user}
-#uucp     unix  -       n       n       -       -       pipe flags=Fqhu user=uucp argv=@bindir@/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
-#ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=@bindir@/ifmail -r $nexthop ($recipient)
-#bsmtp    unix  -       n       n       -       -       pipe flags=Fq. user=foo argv=@bindir@/bsmtp -f $sender $nexthop $recipient
+#maildrop unix  -       n       n       -       -       pipe flags=DRhu user=vmail argv=@@@bindir@@@/maildrop -d ${recipient}
+#cyrus    unix  -       n       n       -       -       pipe user=cyrus argv=@@@bindir@@@/cyrdeliver -e -r ${sender} -m ${extension} ${user}
+#uucp     unix  -       n       n       -       -       pipe flags=Fqhu user=uucp argv=@@@bindir@@@/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
+#ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=@@@bindir@@@/ifmail -r $nexthop ($recipient)
+#bsmtp    unix  -       n       n       -       -       pipe flags=Fq. user=foo argv=@@@bindir@@@/bsmtp -f $sender $nexthop $recipient
 @@@bind_addr@@@:465       inet  n       -       n       -       -       smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
 post-cleanup unix  n    -       n       -       0       cleanup -o virtual_alias_maps= -o masquerade_domains=
 smtp-amavis unix -	-	n	-	2       smtp
@@ -96,26 +96,26 @@ smtp-amavis unix -	-	n	-	2       smtp
     -o smtpd_error_sleep_time=0
     -o smtpd_soft_error_limit=1001
     -o smtpd_hard_error_limit=1000
-kolabpolicy    unix  -       n       n       -       -       spawn user=@emailserver_master_usr@ argv=@bindir@/kolab_smtpdpolicy 
+kolabpolicy    unix  -       n       n       -       -       spawn user=@@@emailserver_master_usr@@@ argv=@@@bindir@@@/kolab_smtpdpolicy 
 
-kolabfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
-    -c @phpini_dir@/php.ini
-    -f @resmgr_scriptsdir@/kolabfilter 
+kolabfilter     unix  -       n       n       -       -       pipe user=@@@emailserver_master_usr@@@ null_sender= argv=@@@PHP@@@
+    -c @@@phpini_dir@@@/php.ini
+    -f @@@resmgr_scriptsdir@@@/kolabfilter 
     --
     --host=@@@fqdnhostname@@@
     --sender=${sender}
     --recipient=${recipient}
     --client=${client_address}
     --user=${sasl_username}
-    --config=@resmgr_confdir@/kolabfilter.conf
+    --config=@@@resmgr_confdir@@@/kolabfilter.conf
 
-kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
-    -c @phpini_dir@/php.ini
-    -f @resmgr_scriptsdir@/kolabmailboxfilter 
+kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@@@emailserver_master_usr@@@ null_sender= argv=@@@PHP@@@
+    -c @@@phpini_dir@@@/php.ini
+    -f @@@resmgr_scriptsdir@@@/kolabmailboxfilter 
     --
     --host=@@@fqdnhostname@@@
     --sender=${sender}
     --recipient=${recipient}
     --client=${client_address}
-    --config=@resmgr_confdir@/kolabfilter.conf
+    --config=@@@resmgr_confdir@@@/kolabfilter.conf
 
diff --git a/conf/templates/smtpd.conf.template.in b/conf/templates/smtpd.conf.template
index b80c2cd..dd2c0b0 100644
--- a/conf/templates/smtpd.conf.template.in
+++ b/conf/templates/smtpd.conf.template
@@ -1,7 +1,7 @@
 KOLAB_META_START
-TARGET=@sasl_smtpconffile@
+TARGET=@@@sasl_smtpconffile@@@
 PERMISSIONS=0644
-OWNERSHIP=@emailserver_usr@:@emailserver_grp@
+OWNERSHIP=@@@emailserver_usr@@@:@@@emailserver_grp@@@
 KOLAB_META_END
 pwcheck_method: saslauthd
 mech_list: plain login