From 212a4172270fd2fc5ed5254a6a188db3a693b43a Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 22 Oct 2009 23:11:25 +0200
Subject: [PATCH] Added example configuration.
---
Makefile.am | 23 ++-------------
configure.in | 4 +++
doc/Makefile.am | 4 +++
doc/example-config/Makefile.am | 2 ++
doc/example-config/conf.d/Makefile.am | 8 +++++
doc/example-config/conf.d/sieve.conf | 42 +++++++++++++++++++++++++++
doc/man/Makefile.am | 17 +++++++++++
7 files changed, 80 insertions(+), 20 deletions(-)
create mode 100644 doc/Makefile.am
create mode 100644 doc/example-config/Makefile.am
create mode 100644 doc/example-config/conf.d/Makefile.am
create mode 100644 doc/example-config/conf.d/sieve.conf
create mode 100644 doc/man/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index bcf53d756..0a1c959a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,10 @@
-SUBDIRS = src
-
-unfinished = doc/man/sieve-filter.1
-
-if BUILD_UNFINISHED
-unfinished_mans = $(unfinished)
-else
-unfinished_dist = $(unfinished)
-endif
+SUBDIRS = src doc
EXTRA_DIST = \
tests \
- examples/* \
- doc/rfc \
- doc/devel \
+ examples \
COPYING.LGPL \
- ChangeLog \
- $(unfinished_dist)
-
-dist_man_MANS = \
- doc/man/sievec.1 \
- doc/man/sieved.1 \
- doc/man/sieve-test.1 \
- $(unfinished_mans)
+ ChangeLog
if MAINTAINER_MODE
ChangeLog: .hg/dirstate
diff --git a/configure.in b/configure.in
index 37db2abde..61467b8a3 100644
--- a/configure.in
+++ b/configure.in
@@ -99,6 +99,10 @@ AC_SUBST(moduledir)
AC_CONFIG_FILES([
Makefile
+doc/Makefile
+doc/man/Makefile
+doc/example-config/Makefile
+doc/example-config/conf.d/Makefile
src/Makefile
src/lib-sieve/Makefile
src/lib-sieve/plugins/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 000000000..12877437d
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = man example-config
+
+EXTRA_DIST = rfc devel
+
diff --git a/doc/example-config/Makefile.am b/doc/example-config/Makefile.am
new file mode 100644
index 000000000..861daae16
--- /dev/null
+++ b/doc/example-config/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = conf.d
+
diff --git a/doc/example-config/conf.d/Makefile.am b/doc/example-config/conf.d/Makefile.am
new file mode 100644
index 000000000..175992957
--- /dev/null
+++ b/doc/example-config/conf.d/Makefile.am
@@ -0,0 +1,8 @@
+pkgsysconfdir = $(sysconfdir)/dovecot
+
+exampledir = $(docdir)/example-config/conf.d
+example_DATA = \
+ sieve.conf
+
+EXTRA_DIST = \
+ $(example_DATA)
diff --git a/doc/example-config/conf.d/sieve.conf b/doc/example-config/conf.d/sieve.conf
new file mode 100644
index 000000000..c2a25f489
--- /dev/null
+++ b/doc/example-config/conf.d/sieve.conf
@@ -0,0 +1,42 @@
+##
+## Settings for the Sieve interpreter
+##
+
+# Do not forget to enable the Sieve plugin in lda.conf and lmtp.conf
+# by adding it to the mail_plugins= settings.
+
+plugin {
+ # The path to the user's main active script.
+ sieve = ~/.dovecot.sieve
+
+ # A path to a global sieve script file, which gets executed ONLY
+ # if user's private Sieve script doesn't exist. Be sure to
+ # pre-compile this script manually using the sievec command line
+ # tool.
+ #sieve_global_path = /var/lib/dovecot/sieve/default.sieve
+
+ # Directory for :personal include scripts for the include extension.
+ sieve_dir = ~/sieve
+
+ # Directory for :global include scripts for the include extension.
+ #sieve_global_dir =
+
+ # Which Sieve language extensions are available to users. By default,
+ # all supported extensions are available, except for deprecated
+ # extensions or those that are still under development. Some system
+ # administrators may want to disable certain Sieve extensions or
+ # enable those that are not available by default. This setting can
+ # use '+' and '-' to specify differences relative to the default.
+ # For example `sieve_extensions = +imapflags' will enable the
+ # deprecated imapflags extension in addition to all extensions
+ # enabled by default.
+ #sieve_extensions = +notify +imapflags
+
+ # The separator that is expected between the :user and :detail
+ # address parts introduced by the subaddress extension. This may also
+ # be a sequence of characters (e.g. '--'). The current implementation
+ # looks for the separator from the left of the localpart and uses the
+ # first one encountered. The :user part is left of the separator and
+ # the :detail part is right.
+ #sieve_subaddress_sep = +
+}
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
new file mode 100644
index 000000000..156e434e4
--- /dev/null
+++ b/doc/man/Makefile.am
@@ -0,0 +1,17 @@
+unfinished = sieve-filter.1
+
+if BUILD_UNFINISHED
+unfinished_mans = $(unfinished)
+else
+unfinished_dist = $(unfinished)
+endif
+
+EXTRA_DIST = \
+ $(unfinished_dist)
+
+dist_man_MANS = \
+ sievec.1 \
+ sieved.1 \
+ sieve-test.1 \
+ $(unfinished_mans)
+
--
GitLab