changeset
Specify required statedir, correct permissions, improve config.
Thu, 05 Nov 2009 18:06:08 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 05 Nov 2009 18:06:08 +0100
- changeset 239
- d2e66a0e1aa8
- parent 238
- 642966b63c34
- child 240
- 073c5bb92328
Specify required statedir, correct permissions, improve config.
1.1 --- a/dovecot/dovecot.conf Thu Nov 05 18:05:07 2009 +0100 1.2 +++ b/dovecot/dovecot.conf Thu Nov 05 18:06:08 2009 +0100 1.3 @@ -7,13 +7,21 @@ 1.4 protocol imap { 1.5 listen = 127.0.0.1:143 1.6 ssl_listen = 127.0.0.1:993 1.7 + log_path = @l_prefix@/var/dovecot/log/imap-error.log 1.8 + info_log_path = @l_prefix@/var/dovecot/log/imap-info.log 1.9 + login_executable = @l_prefix@/libexec/dovecot/imap-login 1.10 + mail_executable = @l_prefix@/libexec/dovecot/rawlog @l_prefix@/libexec/dovecot/imap 1.11 } 1.12 1.13 ssl = yes 1.14 ssl_cert_file = @l_prefix@/etc/x509/example-server.crt.pem 1.15 ssl_key_file = @l_prefix@/etc/x509/example-server.key.pem 1.16 1.17 -login_user = @l_musr@ 1.18 +log_path = @l_prefix@/var/dovecot/log/dovecot-error.log 1.19 +info_log_path = @l_prefix@/var/dovecot/log/dovecot-info.log 1.20 +log_timestamp = '%b %d %H:%M:%S ' 1.21 + 1.22 +login_user = @l_nusr@ 1.23 login_processes_count = 4 1.24 login_max_processes_count = 128 1.25 login_max_connections = 256 1.26 @@ -37,6 +45,8 @@ 1.27 1.28 protocol lda { 1.29 postmaster_address = postmaster 1.30 + log_path = @l_prefix@/var/dovecot/log/deliver-error.log 1.31 + info_log_path = @l_prefix@/var/dovecot/log/deliver-info.log 1.32 } 1.33 1.34 auth default { 1.35 @@ -48,11 +58,15 @@ 1.36 socket listen { 1.37 master { 1.38 path = @l_prefix@/var/dovecot/run/auth-master 1.39 - mode = 0660 1.40 + mode = 0600 1.41 + user = @l_rusr@ 1.42 + group = @l_rugrp@ 1.43 } 1.44 client { 1.45 path = @l_prefix@/var/dovecot/run/auth-client 1.46 mode = 0660 1.47 + user = @l_musr@ 1.48 + group = @l_mgrp@ 1.49 } 1.50 } 1.51 }
2.1 --- a/dovecot/dovecot.patch Thu Nov 05 18:05:07 2009 +0100 2.2 +++ b/dovecot/dovecot.patch Thu Nov 05 18:06:08 2009 +0100 2.3 @@ -1,7 +1,8 @@ 2.4 Index: configure.in 2.5 +diff -Nau configure.in.orig configure.in 2.6 --- configure.in.orig 2009-07-27 07:26:10 +0200 2.7 +++ configure.in 2009-07-27 16:49:17 +0200 2.8 -@@ -1970,14 +1970,14 @@ 2.9 +@@ -1964,14 +1964,14 @@ 2.10 AC_CHECK_PROG(PG_CONFIG, pg_config, YES, NO) 2.11 if test $PG_CONFIG = NO; then 2.12 # based on code from PHP 2.13 @@ -21,9 +22,10 @@ 2.14 PGSQL_LIBDIR=$i/$j 2.15 fi 2.16 Index: configure 2.17 +diff -Nau configure.orig configure 2.18 --- configure.orig 2009-07-27 07:26:28 +0200 2.19 +++ configure 2009-07-27 16:50:02 +0200 2.20 -@@ -29424,14 +29424,14 @@ 2.21 +@@ -29410,14 +29410,14 @@ 2.22 2.23 if test $PG_CONFIG = NO; then 2.24 # based on code from PHP 2.25 @@ -43,6 +45,7 @@ 2.26 PGSQL_LIBDIR=$i/$j 2.27 fi 2.28 Index: src/deliver/deliver.c 2.29 +diff -Nau src/deliver/deliver.c.orig src/deliver/deliver.c 2.30 --- src/deliver/deliver.c.orig 2009-06-28 01:47:56 +0200 2.31 +++ src/deliver/deliver.c 2009-07-27 16:47:39 +0200 2.32 @@ -46,7 +46,7 @@ 2.33 @@ -54,3 +57,36 @@ 2.34 #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON" 2.35 2.36 /* After buffer grows larger than this, create a temporary file to /tmp 2.37 +Index: src/master/master-settings.c 2.38 +diff -Nau src/master/master-settings.c.orig src/master/master-settings.c 2.39 +--- src/master/master-settings.c.orig 2009-05-13 19:32:34.000000000 +0200 2.40 ++++ src/master/master-settings.c 2009-05-27 14:29:11.985776641 +0200 2.41 +@@ -179,8 +179,8 @@ 2.42 + 2.43 + /* general */ 2.44 + MEMBER(protocols) "imap imaps", 2.45 +- MEMBER(listen) "*", 2.46 +- MEMBER(ssl_listen) "", 2.47 ++ MEMBER(listen) "127.0.0.1", 2.48 ++ MEMBER(ssl_listen) "127.0.0.1", 2.49 + 2.50 + MEMBER(ssl) "yes", 2.51 + MEMBER(ssl_ca_file) "", 2.52 +@@ -200,7 +200,7 @@ 2.53 + /* login */ 2.54 + MEMBER(login_dir) "login", 2.55 + MEMBER(login_executable) NULL, 2.56 +- MEMBER(login_user) "dovecot", 2.57 ++ MEMBER(login_user) "@l_musr@", 2.58 + MEMBER(login_greeting) PACKAGE_NAME" ready.", 2.59 + MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c", 2.60 + MEMBER(login_log_format) "%$: %s", 2.61 +@@ -321,7 +321,7 @@ 2.62 + MEMBER(anonymous_username) "anonymous", 2.63 + MEMBER(krb5_keytab) "", 2.64 + MEMBER(gssapi_hostname) "", 2.65 +- MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth", 2.66 ++ MEMBER(winbind_helper_path) "@l_prefix@/bin/ntlm_auth", 2.67 + MEMBER(failure_delay) 2, 2.68 + 2.69 + MEMBER(verbose) FALSE,
3.1 --- a/dovecot/dovecot.spec Thu Nov 05 18:05:07 2009 +0100 3.2 +++ b/dovecot/dovecot.spec Thu Nov 05 18:06:08 2009 +0100 3.3 @@ -42,7 +42,7 @@ 3.4 Group: Mail 3.5 License: MIT+LGPL 3.6 Version: %{V_major}.%{V_minor} 3.7 -Release: 20091101 3.8 +Release: 20091104 3.9 3.10 # package options 3.11 %option with_fsl yes 3.12 @@ -176,6 +176,7 @@ 3.13 --datadir=%{l_prefix}/share/dovecot \ 3.14 --docdir=%{l_prefix}/share/dovecot/doc \ 3.15 --with-rundir=%{l_prefix}/var/dovecot/run \ 3.16 + --with-statedir=%{l_prefix}/var/dovecot/dat \ 3.17 --with-libiconv-prefix=%{l_prefix} \ 3.18 --with-ssl=openssl \ 3.19 --with-docs \ 3.20 @@ -218,7 +219,6 @@ 3.21 --without-gssapi \ 3.22 --without-lucene \ 3.23 --without-vpopmail \ 3.24 - --enable-shared \ 3.25 --disable-static 3.26 %{l_make} %{l_mflags -O} 3.27 3.28 @@ -254,28 +254,29 @@ 3.29 3.30 %install 3.31 rm -rf $RPM_BUILD_ROOT 3.32 - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 3.33 + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 3.34 3.35 %if "%{with_sieve}" == "yes" 3.36 # install optional Dovecot LDA sieve plugin 3.37 ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve} 3.38 - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 3.39 + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 3.40 ) || exit $? 3.41 %endif 3.42 %if "%{with_managesieve}" == "yes" 3.43 # install optional Dovecot LDA managesieve daemon 3.44 ( cd dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved} 3.45 - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 3.46 + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 3.47 ) || exit $? 3.48 %endif 3.49 3.50 # create additional dirctories 3.51 %{l_shtool} mkdir -f -p -m 755 \ 3.52 $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ssl \ 3.53 + $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/dat \ 3.54 $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/log \ 3.55 $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/run/login 3.56 3.57 - # install run-command script 3.58 + # install runcommand script 3.59 %{l_shtool} mkdir -f -p -m 755 \ 3.60 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d 3.61 %{l_shtool} install -c -m 755 %{l_value -s -a} \ 3.62 @@ -286,6 +287,10 @@ 3.63 rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/dovecot*example.conf 3.64 rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/{,*}/*.la \ 3.65 >/dev/null 2>&1 || true 3.66 + rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/auth \ 3.67 + $RPM_BUILD_ROOT%{l_prefix}/include/dovecot \ 3.68 + $RPM_BUILD_ROOT%{l_prefix}/include \ 3.69 + >/dev/null 2>&1 || true 3.70 strip \ 3.71 $RPM_BUILD_ROOT%{l_prefix}/sbin/* \ 3.72 $RPM_BUILD_ROOT%{l_prefix}/libexec/dovecot/* \ 3.73 @@ -294,7 +299,7 @@ 3.74 # install default server configuration 3.75 %{l_shtool} mkdir -f -p -m 755 \ 3.76 $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot 3.77 - %{l_shtool} install -c -m 644 %{l_value -s -a} \ 3.78 + %{l_shtool} install -c -m 640 %{l_value -s -a} \ 3.79 %{SOURCE dovecot.conf} \ 3.80 $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ 3.81 3.82 @@ -310,12 +315,13 @@ 3.83 '%not %dir %{l_prefix}/etc/fsl' \ 3.84 '%config %{l_prefix}/etc/fsl/fsl.dovecot' \ 3.85 '%config %attr(0600,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/dovecot/*' \ 3.86 - '%config %attr(0644,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \ 3.87 + '%config %attr(0640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \ 3.88 '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/dovecot/ssl' \ 3.89 - '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot' \ 3.90 - '%dir %attr(0770,%{l_susr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \ 3.91 - '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run' \ 3.92 - '%dir %attr(0750,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run/login' \ 3.93 + '%dir %attr(0755,%{l_musr},%{l_mgrp}) %{l_prefix}/var/dovecot' \ 3.94 + '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/dat' \ 3.95 + '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \ 3.96 + '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/run' \ 3.97 + '%dir %attr(0750,%{l_musr},%{l_ngrp}) %{l_prefix}/var/dovecot/run/login' \ 3.98 '%doc %{l_prefix}/share/dovecot/doc' \ 3.99 '%doc %{l_prefix}/share/dovecot/doc/wiki' 3.100 3.101 @@ -336,6 +342,7 @@ 3.102 [ $1 -eq 0 ] || exit 0 3.103 %{l_rc} dovecot stop 2>/dev/null 3.104 rm -f $RPM_INSTALL_PREFIX/var/dovecot/* >/dev/null 2>&1 || true 3.105 + rm -f $RPM_INSTALL_PREFIX/var/dovecot/dat/* >/dev/null 2>&1 || true 3.106 rm -f $RPM_INSTALL_PREFIX/var/dovecot/log/* >/dev/null 2>&1 || true 3.107 rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/* >/dev/null 2>&1 || true 3.108 rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/login/* >/dev/null 2>&1 || true
