From: Timo Sirainen Date: Mon, 12 Jul 2010 12:24:16 +0000 (+0100) Subject: man: Use pkgsysconfdir instead of explicit sysconfdir/dovecot X-Git-Tag: 2.0.rc3~78 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5717e8e12768ab1d667cd3e908e5f3ffe540655a;p=thirdparty%2Fdovecot%2Fcore.git man: Use pkgsysconfdir instead of explicit sysconfdir/dovecot --- diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 2f98fb912b..3e836e0b4c 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,3 +1,5 @@ +pkgsysconfdir = $(sysconfdir)/dovecot + dist_man1_MANS = \ deliver.1 \ doveadm-config.1 \ @@ -66,93 +68,93 @@ EXTRA_DIST = \ 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 diff --git a/doc/man/doveadm-altmove.1.in b/doc/man/doveadm-altmove.1.in index 7e89ae5c3f..e4dbef1a24 100644 --- a/doc/man/doveadm-altmove.1.in +++ b/doc/man/doveadm-altmove.1.in @@ -52,10 +52,10 @@ for details. .\"------------------------------------------------------------------------ .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 diff --git a/doc/man/doveadm-auth.1.in b/doc/man/doveadm-auth.1.in index c6e5c4a641..c4c4bcb510 100644 --- a/doc/man/doveadm-auth.1.in +++ b/doc/man/doveadm-auth.1.in @@ -34,7 +34,7 @@ will use the socket 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 diff --git a/doc/man/doveadm-director.1.in b/doc/man/doveadm-director.1.in index 46fd3fe10f..5d4f630044 100644 --- a/doc/man/doveadm-director.1.in +++ b/doc/man/doveadm-director.1.in @@ -49,7 +49,7 @@ will use the socket 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 @@ the whole proxy cluster was restarted fresh. .\"------------------------------------------------------------------------ .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 diff --git a/doc/man/doveadm-kick.1.in b/doc/man/doveadm-kick.1.in index 6691e5b814..9bbdd9b984 100644 --- a/doc/man/doveadm-kick.1.in +++ b/doc/man/doveadm-kick.1.in @@ -58,7 +58,7 @@ will use the socket 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 diff --git a/doc/man/doveadm-log.1.in b/doc/man/doveadm-log.1.in index 09b0557d28..92d9287bb9 100644 --- a/doc/man/doveadm-log.1.in +++ b/doc/man/doveadm-log.1.in @@ -57,7 +57,7 @@ and .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. .\"------------------------------------- diff --git a/doc/man/doveadm-penalty.1.in b/doc/man/doveadm-penalty.1.in index 6fc214b2b8..796cc15172 100644 --- a/doc/man/doveadm-penalty.1.in +++ b/doc/man/doveadm-penalty.1.in @@ -34,7 +34,7 @@ will use the socket 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 diff --git a/doc/man/doveadm-quota.1.in b/doc/man/doveadm-quota.1.in index cc93dfb37e..bc8baeeef1 100644 --- a/doc/man/doveadm-quota.1.in +++ b/doc/man/doveadm-quota.1.in @@ -81,19 +81,19 @@ command is used to recalculate the current quota usage. .\"------------------------------------------------------------------------ .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 diff --git a/doc/man/doveadm-user.1.in b/doc/man/doveadm-user.1.in index fdfc4c3047..2a7c424f28 100644 --- a/doc/man/doveadm-user.1.in +++ b/doc/man/doveadm-user.1.in @@ -55,7 +55,7 @@ will use the socket 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 diff --git a/doc/man/doveadm-who.1.in b/doc/man/doveadm-who.1.in index 6f050ae23d..92119cbf51 100644 --- a/doc/man/doveadm-who.1.in +++ b/doc/man/doveadm-who.1.in @@ -46,7 +46,7 @@ will use the socket 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 diff --git a/doc/man/doveadm.1.in b/doc/man/doveadm.1.in index 3a38efa0c4..2d19fbcc82 100644 --- a/doc/man/doveadm.1.in +++ b/doc/man/doveadm.1.in @@ -147,13 +147,13 @@ but none was specified. .\"------------------------------------------------------------------------ .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@ diff --git a/doc/man/doveconf.1.in b/doc/man/doveconf.1.in index d744f520bf..1dd4a06cc8 100644 --- a/doc/man/doveconf.1.in +++ b/doc/man/doveconf.1.in @@ -48,7 +48,7 @@ Show all settings with their currently configured values. 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 @@ can be also used to convert v1.x configuration files into v2.0 format. .sp .nf .B doveconf \-n \-c /oldpath/dovecot.conf > \ -@sysconfdir@/dovecot/dovecot.conf.new +@pkgsysconfdir@/dovecot.conf.new .fi .\"------------------------------------- .PP @@ -167,7 +167,7 @@ This example demonstrates how to dump a whole configuration section. .nf .B doveconf dict dict { - quota = pgsql:@sysconfdir@/dovecot/dovecot\-dict\-sql.conf.ext + quota = pgsql:@pkgsysconfdir@/dovecot\-dict\-sql.conf.ext } .fi .\"------------------------------------------------------------------------ diff --git a/doc/man/dovecot-lda.1.in b/doc/man/dovecot-lda.1.in index 8f0189b97a..dc551fd272 100644 --- a/doc/man/dovecot-lda.1.in +++ b/doc/man/dovecot-lda.1.in @@ -112,19 +112,19 @@ file for details. (EX_TEMPFAIL) .\"------------------------------------------------------------------------ .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@ diff --git a/doc/man/dovecot.1.in b/doc/man/dovecot.1.in index f6b42e2545..b67abb5a99 100644 --- a/doc/man/dovecot.1.in +++ b/doc/man/dovecot.1.in @@ -125,22 +125,22 @@ are ignored. .\"------------------------------------------------------------------------ .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@ diff --git a/doc/man/dsync.1.in b/doc/man/dsync.1.in index 4061aad9b5..342f07567d 100644 --- a/doc/man/dsync.1.in +++ b/doc/man/dsync.1.in @@ -67,7 +67,7 @@ The default is to synchronize all respectively convert from all mailboxes. 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 @@ If you need more complex parameters to ssh, you can use e.g.: 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 diff --git a/doc/man/sed.sh b/doc/man/sed.sh index 60d1ce7b53..d84dd6b620 100644 --- a/doc/man/sed.sh +++ b/doc/man/sed.sh @@ -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 @@ sed -e "/^@INCLUDE:global-options@$/{ -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}|"