diff options
| author |   Li xin <lixin.fnst@cn.fujitsu.com> | 2015-06-05 16:49:26 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2015-06-05 19:05:40 -0400 |
| commit | 6a84fe282ec641a07bc258fadeba475e8d326e68 (patch) | |
| tree | 8ac87f0285dcee08017ef9ec88e9869a6560cc27 /meta-networking/recipes-support | |
| parent | 40639902b51f88d15de30cbe9c1d98ada4685486 (diff) | |
| download | meta-openembedded-contrib-6a84fe282ec641a07bc258fadeba475e8d326e68.tar.gz | |
dovecot: add systemd support and add user dovecot dovenull which is need to start dovecot service.
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support')
3 files changed, 51 insertions, 3 deletions
diff --git a/meta-networking/recipes-support/dovecot/dovecot/dovecot.service b/meta-networking/recipes-support/dovecot/dovecot/dovecot.service new file mode 100644 index 0000000000..ca250ea5d3 --- /dev/null +++ b/meta-networking/recipes-support/dovecot/dovecot/dovecot.service @@ -0,0 +1,14 @@ +[Unit] +Description=Dovecot IMAP/POP3 email server +After=local-fs.target network.target + +[Service] +Type=simple +EnvironmentFile=-@SYSCONFDIR@/sysconfig/dovecot +ExecStart=@SBINDIR@/dovecot -F +ExecReload=/bin/kill -HUP $MAINPID +NonBlocking=yes + +[Install] +WantedBy=multi-user.target + diff --git a/meta-networking/recipes-support/dovecot/dovecot/dovecot.socket b/meta-networking/recipes-support/dovecot/dovecot/dovecot.socket new file mode 100644 index 0000000000..556e1a8506 --- /dev/null +++ b/meta-networking/recipes-support/dovecot/dovecot/dovecot.socket @@ -0,0 +1,14 @@ +[Unit] +Description=Dovecot IMAP/POP3 email server activation socket + +[Socket] +#dovecot expects separate IPv4 and IPv6 sockets +BindIPv6Only=ipv6-only +ListenStream=0.0.0.0:143 +ListenStream=[::]:143 +ListenStream=0.0.0.0:993 +ListenStream=[::]:993 +KeepAlive=true + +[Install] +WantedBy=sockets.target diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.2.10.bb b/meta-networking/recipes-support/dovecot/dovecot_2.2.10.bb index f733a7832f..82225b0024 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.2.10.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.2.10.bb @@ -7,13 +7,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a981379bd0f1c362f8d1d21515e5b30b" SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ file://building-rquota_xdr.c-depend-on-rquota.h.patch \ - " + file://dovecot.service \ + file://dovecot.socket" + SRC_URI[md5sum] = "037e9c9e07d9dbff54dcff09f280fc8c" SRC_URI[sha256sum] = "75592483d40dc4f76cc3b41af40caa4be80478946a699d46846d5d03e4d2e09b" DEPENDS = "openssl xz zlib bzip2 libcap" -inherit autotools pkgconfig +inherit autotools pkgconfig systemd useradd PACKAGECONFIG ??= " \ ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ @@ -37,7 +39,25 @@ CACHED_CONFIGUREVARS += "i_cv_signed_size_t=no \ # hardcode epoll() to avoid running unsafe tests # BSD needs kqueue and uclibc poll() -EXTRA_OECONF = " --with-ioloop=epoll" +EXTRA_OECONF = " --with-ioloop=epoll \ + --with-systemdsystemunitdir=${systemd_unitdir}/system" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" +SYSTEMD_AUTO_ENABLE = "disable" + +do_install_append () { + install -d 755 ${D}/etc/dovecot + touch 644 ${D}/etc/dovecot/dovecot.conf + install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ + -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" +GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" FILES_${PN}-dev += "${libdir}/dovecot/*.so" |