Mercurial > dovecot > core-2.2

changeset 11798:a2bbd6c3624a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
man: Use pkgsysconfdir instead of explicit sysconfdir/dovecot
author Timo Sirainen <tss@iki.fi>
date Mon, 12 Jul 2010 13:24:16 +0100
parents ca5cea0c614a
children 30317b89b101
files doc/man/Makefile.am doc/man/doveadm-altmove.1.in doc/man/doveadm-auth.1.in doc/man/doveadm-director.1.in doc/man/doveadm-kick.1.in doc/man/doveadm-log.1.in doc/man/doveadm-penalty.1.in doc/man/doveadm-quota.1.in doc/man/doveadm-user.1.in doc/man/doveadm-who.1.in doc/man/doveadm.1.in doc/man/doveconf.1.in doc/man/dovecot-lda.1.in doc/man/dovecot.1.in doc/man/dsync.1.in doc/man/sed.sh
diffstat 16 files changed, 61 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/doc/man/Makefile.am	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/Makefile.am	Mon Jul 12 13:24:16 2010 +0100
@@ -1,3 +1,5 @@
+pkgsysconfdir = $(sysconfdir)/dovecot
+
 dist_man1_MANS = \
 	deliver.1 \
 	doveadm-config.1 \
@@ -66,93 +68,93 @@
 CLEANFILES = $(nodist_man1_MANS)
 
 doveadm.1: $(srcdir)/doveadm.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm.1.in > doveadm.1
 
 doveadm-altmove.1: $(srcdir)/doveadm-altmove.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-altmove.1.in > doveadm-altmove.1
 
 doveadm-auth.1: $(srcdir)/doveadm-auth.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-auth.1.in > doveadm-auth.1
 
 doveadm-director.1: $(srcdir)/doveadm-director.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-director.1.in > doveadm-director.1
 
 doveadm-dump.1: $(srcdir)/doveadm-dump.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-dump.1.in > doveadm-dump.1
 
 doveadm-expunge.1: $(srcdir)/doveadm-expunge.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-expunge.1.in > doveadm-expunge.1
 
 doveadm-fetch.1: $(srcdir)/doveadm-fetch.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-fetch.1.in > doveadm-fetch.1
 
 doveadm-force-resync.1: $(srcdir)/doveadm-force-resync.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-force-resync.1.in > doveadm-force-resync.1
 
 doveadm-help.1: $(srcdir)/doveadm-help.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-help.1.in > doveadm-help.1
 
 doveadm-kick.1: $(srcdir)/doveadm-kick.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-kick.1.in > doveadm-kick.1
 
 doveadm-log.1: $(srcdir)/doveadm-log.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-log.1.in > doveadm-log.1
 
 doveadm-mailbox.1: $(srcdir)/doveadm-mailbox.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-mailbox.1.in > doveadm-mailbox.1
 
 doveadm-penalty.1: $(srcdir)/doveadm-penalty.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-penalty.1.in > doveadm-penalty.1
 
 doveadm-purge.1: $(srcdir)/doveadm-purge.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-purge.1.in > doveadm-purge.1
 
 doveadm-pw.1: $(srcdir)/doveadm-pw.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-pw.1.in > doveadm-pw.1
 
 doveadm-quota.1: $(srcdir)/doveadm-quota.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-quota.1.in > doveadm-quota.1
 
 doveadm-search.1: $(srcdir)/doveadm-search.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-search.1.in > doveadm-search.1
 
 doveadm-user.1: $(srcdir)/doveadm-user.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-user.1.in > doveadm-user.1
 
 doveadm-who.1: $(srcdir)/doveadm-who.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveadm-who.1.in > doveadm-who.1
 
 doveconf.1: $(srcdir)/doveconf.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/doveconf.1.in > doveconf.1
 
 dovecot.1: $(srcdir)/dovecot.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/dovecot.1.in > dovecot.1
 
 dovecot-lda.1: $(srcdir)/dovecot-lda.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/dovecot-lda.1.in > dovecot-lda.1
 
 dsync.1: $(srcdir)/dsync.1.in Makefile
-	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(sysconfdir) \
+	$(SHELL) $(srcdir)/sed.sh $(srcdir) $(rundir) $(pkgsysconfdir) \
 		< $(srcdir)/dsync.1.in > dsync.1
--- a/doc/man/doveadm-altmove.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm-altmove.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -52,10 +52,10 @@
 .\"------------------------------------------------------------------------
 .SH FILES
 .TP
-.I @sysconfdir@/dovecot/conf.d/10\-mail.conf
+.I @pkgsysconfdir@/conf.d/10\-mail.conf
 Mailbox locations and namespaces.
 .TP
-.I @sysconfdir@/dovecot/conf.d/auth\-*.conf.ext
+.I @pkgsysconfdir@/conf.d/auth\-*.conf.ext
 Authentication processes, including userdb settings.
 .\"------------------------------------------------------------------------
 .SH EXAMPLE
--- a/doc/man/doveadm-auth.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm-auth.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -34,7 +34,7 @@
 The socket may be located in another directory, when the default
 .I base_dir
 setting was overridden in
-.IR @sysconfdir@/dovecot/dovecot.conf .
+.IR @pkgsysconfdir@/dovecot.conf .
 .\"-------------------------------------
 .TP
 .BI \-x\  auth_info
--- a/doc/man/doveadm-director.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm-director.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -49,7 +49,7 @@
 The socket may be located in another directory, when the default
 .I base_dir
 setting was overridden in
-.IR @sysconfdir@/dovecot/dovecot.conf .
+.IR @pkgsysconfdir@/dovecot.conf .
 .\"------------------------------------------------------------------------
 .SH ARGUMENTS
 .TP
@@ -126,10 +126,10 @@
 .\"------------------------------------------------------------------------
 .SH FILES
 .TP
-.I @sysconfdir@/dovecot/dovecot.conf
+.I @pkgsysconfdir@/dovecot.conf
 Dovecot\(aqs main configuration file.
 .TP
-.I @sysconfdir@/dovecot/conf.d/10\-director.conf
+.I @pkgsysconfdir@/conf.d/10\-director.conf
 Director specific settings.
 .\"------------------------------------------------------------------------
 .SH EXAMPLE
--- a/doc/man/doveadm-kick.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm-kick.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -58,7 +58,7 @@
 The socket may be located in another directory, when the default
 .I base_dir
 setting was overridden in
-.IR @sysconfdir@/dovecot/dovecot.conf .
+.IR @pkgsysconfdir@/dovecot.conf .
 .\"-------------------------------------
 .TP
 .B \-f
--- a/doc/man/doveadm-log.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm-log.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -57,7 +57,7 @@
 .I debug_log_path
 settings.
 These settings are configured in
-.IR @sysconfdir@/dovecot/conf.d/10\-logging.conf .
+.IR @pkgsysconfdir@/conf.d/10\-logging.conf .
 .br
 This is for example useful after manually rotating the log files.
 .\"-------------------------------------
--- a/doc/man/doveadm-penalty.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm-penalty.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -34,7 +34,7 @@
 The socket may be located in another directory, when the default
 .I base_dir
 setting was overridden in
-.IR @sysconfdir@/dovecot/dovecot.conf .
+.IR @pkgsysconfdir@/dovecot.conf .
 .\"------------------------------------------------------------------------
 .SH ARGUMENTS
 .TP
--- a/doc/man/doveadm-quota.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm-quota.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -81,19 +81,19 @@
 .\"------------------------------------------------------------------------
 .SH FILES
 .TP
-.I @sysconfdir@/dovecot/dovecot.conf
+.I @pkgsysconfdir@/dovecot.conf
 Dovecot\(aqs main configuration file, including the
 .I dict
 section.
 .TP
-.I @sysconfdir@/dovecot/dovecot\-dict\-sql.conf.ext
+.I @pkgsysconfdir@/dovecot\-dict\-sql.conf.ext
 SQL dictionary proxy settings.
 .TP
-.I @sysconfdir@/dovecot/conf.d/10\-mail.conf
+.I @pkgsysconfdir@/conf.d/10\-mail.conf
 Mailbox locations and namespaces, including global
 .I mail_location
 .TP
-.I @sysconfdir@/dovecot/conf.d/90\-quota.conf
+.I @pkgsysconfdir@/conf.d/90\-quota.conf
 Quota configuration.
 .\"------------------------------------------------------------------------
 .SH EXAMPLE
--- a/doc/man/doveadm-user.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm-user.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -55,7 +55,7 @@
 The socket may be located in another directory, when the default
 .I base_dir
 setting was overridden in
-.IR @sysconfdir@/dovecot/dovecot.conf .
+.IR @pkgsysconfdir@/dovecot.conf .
 .\"-------------------------------------
 .TP
 .BI \-x\  auth_info
--- a/doc/man/doveadm-who.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm-who.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -46,7 +46,7 @@
 The socket may be located in another directory, when the default
 .I base_dir
 setting was overridden in
-.IR @sysconfdir@/dovecot/dovecot.conf .
+.IR @pkgsysconfdir@/dovecot.conf .
 .\"------------------------------------------------------------------------
 .SH ARGUMENTS
 .TP
--- a/doc/man/doveadm.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveadm.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -147,13 +147,13 @@
 .\"------------------------------------------------------------------------
 .SH FILES
 .TP
-.I @sysconfdir@/dovecot/dovecot.conf
+.I @pkgsysconfdir@/dovecot.conf
 Dovecot\(aqs main configuration file.
 .TP
-.I @sysconfdir@/dovecot/conf.d/10\-mail.conf
+.I @pkgsysconfdir@/conf.d/10\-mail.conf
 Mailbox locations and namespaces.
 .TP
-.I @sysconfdir@/dovecot/conf.d/90\-plugin.conf
+.I @pkgsysconfdir@/conf.d/90\-plugin.conf
 Plugin specific settings.
 .\"------------------------------------------------------------------------
 @INCLUDE:reporting-bugs@
--- a/doc/man/doveconf.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/doveconf.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -48,7 +48,7 @@
 read configuration from the given
 .IR config\-file .
 By default
-.I @sysconfdir@/dovecot/dovecot.conf
+.I @pkgsysconfdir@/dovecot.conf
 will be used.
 .\"---------------------------------
 .TP
@@ -143,7 +143,7 @@
 .sp
 .nf
 .B doveconf \-n \-c /oldpath/dovecot.conf > \
-@sysconfdir@/dovecot/dovecot.conf.new
+@pkgsysconfdir@/dovecot.conf.new
 .fi
 .\"-------------------------------------
 .PP
@@ -167,7 +167,7 @@
 .nf
 .B doveconf dict
 dict {
-  quota = pgsql:@sysconfdir@/dovecot/dovecot\-dict\-sql.conf.ext
+  quota = pgsql:@pkgsysconfdir@/dovecot\-dict\-sql.conf.ext
 }
 .fi
 .\"------------------------------------------------------------------------
--- a/doc/man/dovecot-lda.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/dovecot-lda.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -112,19 +112,19 @@
 .\"------------------------------------------------------------------------
 .SH FILES
 .TP
-.I @sysconfdir@/dovecot/dovecot.conf
+.I @pkgsysconfdir@/dovecot.conf
 Dovecot\(aqs main configuration file.
 .TP
-.I @sysconfdir@/dovecot/conf.d/10\-mail.conf
+.I @pkgsysconfdir@/conf.d/10\-mail.conf
 Mailbox locations and namespaces.
 .TP
-.I @sysconfdir@/dovecot/conf.d/15\-lda.conf
+.I @pkgsysconfdir@/conf.d/15\-lda.conf
 LDA specific settings.
 .TP
-.I @sysconfdir@/dovecot/conf.d/90\-plugin.conf
+.I @pkgsysconfdir@/conf.d/90\-plugin.conf
 Plugin specific settings.
 .TP
-.I @sysconfdir@/dovecot/conf.d/90\-quota.conf
+.I @pkgsysconfdir@/conf.d/90\-quota.conf
 Quota configuration.
 .\"------------------------------------------------------------------------
 @INCLUDE:reporting-bugs@
--- a/doc/man/dovecot.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/dovecot.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -125,22 +125,22 @@
 .\"------------------------------------------------------------------------
 .SH FILES
 .TP
-.I @sysconfdir@/dovecot/dovecot.conf
+.I @pkgsysconfdir@/dovecot.conf
 Dovecot\(aqs main configuration file.
 .TP
-.I @sysconfdir@/dovecot/dovecot\-ldap.conf.ext
+.I @pkgsysconfdir@/dovecot\-ldap.conf.ext
 Dovecot\(aqs LDAP authdb/userdb module configuration file.
 .TP
-.I @sysconfdir@/dovecot/dovecot\-sql.conf.ext
+.I @pkgsysconfdir@/dovecot\-sql.conf.ext
 Dovecot\(aqs SQL authdb/userdb module configuration file.
 .TP
-.I @sysconfdir@/dovecot/dovecot\-dict\-sql.conf.ext
+.I @pkgsysconfdir@/dovecot\-dict\-sql.conf.ext
 Dovecot\(aqs dict configuration with SQL\-backend.
 .TP
-.I @sysconfdir@/dovecot/conf.d/auth\-*\-conf.ext
+.I @pkgsysconfdir@/conf.d/auth\-*\-conf.ext
 Configuration files of different authentication modules.
 .TP
-.I @sysconfdir@/dovecot/conf.d/*.conf
+.I @pkgsysconfdir@/conf.d/*.conf
 Configuration files of different services and settings.
 .\"------------------------------------------------------------------------
 @INCLUDE:reporting-bugs@
--- a/doc/man/dsync.1.in	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/dsync.1.in	Mon Jul 12 13:24:16 2010 +0100
@@ -67,7 +67,7 @@
 Overrides the configuration
 .I setting
 from
-.I @sysconfdir@/dovecot/dovecot.conf
+.I @pkgsysconfdir@/dovecot.conf
 and from the userdb with the given
 .IR value .
 In order to override multiple settings to
@@ -171,7 +171,7 @@
 Assuming that the
 .I mail_location
 setting in
-.I @sysconfdir@/dovecot/conf.d/10\-mail.conf
+.I @pkgsysconfdir@/conf.d/10\-mail.conf
 is set to:
 .BR "mail_location = mdbox:~/mdbox" ,
 a logged in system user may convert her/his mails from its Maildir in
--- a/doc/man/sed.sh	Mon Jul 12 13:19:32 2010 +0100
+++ b/doc/man/sed.sh	Mon Jul 12 13:24:16 2010 +0100
@@ -2,7 +2,7 @@
 
 SRCDIR="${1:-`pwd`}"
 RUNDIR="${2:-/usr/local/var/run/dovecot}"
-SYSCONFDIR="${3:-/usr/local/etc}"
+PKGSYSCONFDIR="${3:-/usr/local/etc/dovecot}"
 
 sed -e "/^@INCLUDE:global-options@$/{
 		r ${SRCDIR}/global-options.inc
@@ -23,5 +23,5 @@
 	-e "/^@INCLUDE:reporting-bugs@$/{
 		r ${SRCDIR}/reporting-bugs.inc
 		d
-	}" | sed -e "s|@sysconfdir@|${SYSCONFDIR}|" -e "s|@rundir@|${RUNDIR}|"
+	}" | sed -e "s|@pkgsysconfdir@|${PKGSYSCONFDIR}|" -e "s|@rundir@|${RUNDIR}|"