rpms/dovecot
7
0
Fork 0
Code Issues Pull Requests Releases Activity

move ssl certs from /usr/share/ssl to /etc/pki/dovecot

Browse Source
This commit is contained in:
John Dennis 2005-04-22 21:01:48 +00:00
parent 7bd282783f
commit a88a87906d
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dovecot-0.99.10.4-conf.patch
View File

@ -5,7 +5,7 @@
# with real defaults being based on configure options. The paths listed here # with real defaults being based on configure options. The paths listed here
# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var # are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-# --with-ssldir=/etc/ssl -# --with-ssldir=/etc/ssl
+# --with-ssldir=/usr/share/ssl +# --with-ssldir=/etc/pki/dovecot
# Base directory where to store runtime data. # Base directory where to store runtime data.
#base_dir = /var/run/dovecot/ #base_dir = /var/run/dovecot/
@ -26,8 +26,8 @@
# certificate, just make sure to update the domains in dovecot-openssl.cnf # certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem -#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem -#ssl_key_file = /etc/ssl/private/dovecot.pem
+#ssl_cert_file = /usr/share/ssl/certs/dovecot.pem +#ssl_cert_file = /etc/pki/dovecot/dovecot.pem
+#ssl_key_file = /usr/share/ssl/private/dovecot.pem +#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
# SSL parameter file. Master process generates this file for login processes. # SSL parameter file. Master process generates this file for login processes.
# It contains Diffie Hellman and RSA parameters. # It contains Diffie Hellman and RSA parameters.

8
dovecot-configfile.patch
View File

@ -42,8 +42,8 @@
# certificate, just make sure to update the domains in dovecot-openssl.cnf # certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem -#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem -#ssl_key_file = /etc/ssl/private/dovecot.pem
+ssl_cert_file = /usr/share/ssl/certs/dovecot.pem +ssl_cert_file = /etc/pki/dovecot/dovecot.pem
+ssl_key_file = /usr/share/ssl/private/dovecot.pem +ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
# SSL parameter file. Master process generates this file for login processes. # SSL parameter file. Master process generates this file for login processes.
# It contains Diffie Hellman and RSA parameters. # It contains Diffie Hellman and RSA parameters.
@ -74,13 +74,13 @@ diff -u -r dovecot-0.99.11.orig/doc/mkcert.sh dovecot-0.99.11/doc/mkcert.sh
OPENSSL=${OPENSSL-openssl} OPENSSL=${OPENSSL-openssl}
-SSLDIR=${SSLDIR-/etc/ssl} -SSLDIR=${SSLDIR-/etc/ssl}
-OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf} -OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}
+SSLDIR=${SSLDIR-/usr/share/ssl} +SSLDIR=${SSLDIR-/etc/pki/dovecot}
+OPENSSLCONFIG=${OPENSSLCONFIG-$SSLDIR/dovecot-openssl.cnf} +OPENSSLCONFIG=${OPENSSLCONFIG-$SSLDIR/dovecot-openssl.cnf}
+CERTNAME=${CERTNAME-dovecot} +CERTNAME=${CERTNAME-dovecot}
-CERTFILE=$SSLDIR/certs/imapd.pem -CERTFILE=$SSLDIR/certs/imapd.pem
-KEYFILE=$SSLDIR/private/imapd.pem -KEYFILE=$SSLDIR/private/imapd.pem
+CERTFILE=$SSLDIR/certs/$CERTNAME.pem +CERTFILE=$SSLDIR/$CERTNAME.pem
+KEYFILE=$SSLDIR/private/$CERTNAME.pem +KEYFILE=$SSLDIR/private/$CERTNAME.pem
if [ ! -d $SSLDIR/certs ]; then if [ ! -d $SSLDIR/certs ]; then

27
dovecot.spec
View File

@ -1,7 +1,7 @@
Summary: Dovecot Secure imap server Summary: Dovecot Secure imap server
Name: dovecot Name: dovecot
Version: 0.99.14 Version: 0.99.14
Release: 3.fc4 Release: 4.fc4
License: LGPL License: LGPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -32,7 +32,7 @@ BuildRequires: zlib-devel
# gettext-devel is needed for running autoconf because of the # gettext-devel is needed for running autoconf because of the
# presence of AM_ICONV # presence of AM_ICONV
BuildRequires: gettext-devel BuildRequires: gettext-devel
Prereq: openssl, /sbin/chkconfig, /usr/sbin/useradd Prereq: openssl >= 0.9.7f-4, /sbin/chkconfig, /usr/sbin/useradd
%if %{build_postgres} %if %{build_postgres}
BuildRequires: postgresql-devel BuildRequires: postgresql-devel
@ -43,7 +43,7 @@ BuildRequires: mysql-devel
%endif %endif
%define docdir %{_docdir}/%{name}-%{version} %define docdir %{_docdir}/%{name}-%{version}
%define ssldir /usr/share/ssl %define ssldir /etc/pki/%{name}
%define restart_flag /tmp/%{name}-restart-after-rpm-install %define restart_flag /tmp/%{name}-restart-after-rpm-install
%define dovecot_uid 97 %define dovecot_uid 97
%define dovecot_gid 97 %define dovecot_gid 97
@ -93,9 +93,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/dovecot install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/dovecot
# generate ghost .pem file # generate ghost .pem file
mkdir -p $RPM_BUILD_ROOT/%{ssldir}/{certs,private} mkdir -p $RPM_BUILD_ROOT/%{ssldir}/private
touch $RPM_BUILD_ROOT/%{ssldir}/{certs,private}/dovecot.pem touch $RPM_BUILD_ROOT/%{ssldir}/dovecot.pem
chmod 600 $RPM_BUILD_ROOT/%{ssldir}/{certs,private}/dovecot.pem chmod 600 $RPM_BUILD_ROOT/%{ssldir}/dovecot.pem
touch $RPM_BUILD_ROOT/%{ssldir}/private/dovecot.pem
chmod 600 $RPM_BUILD_ROOT/%{ssldir}/private/dovecot.pem
mkdir -p $RPM_BUILD_ROOT/var/run/dovecot mkdir -p $RPM_BUILD_ROOT/var/run/dovecot
chmod 700 $RPM_BUILD_ROOT/var/run/dovecot chmod 700 $RPM_BUILD_ROOT/var/run/dovecot
@ -124,7 +126,13 @@ fi
%post %post
/sbin/chkconfig --add %{name} /sbin/chkconfig --add %{name}
# create a ssl cert # create a ssl cert
if [ ! -f %{ssldir}/certs/%{name}.pem ]; then if [ -f /usr/share/ssl/certs/dovecot.pem -a ! -f %{ssldir}/%{name}.pem ]; then
mv /usr/share/ssl/certs/dovecot.pem %{ssldir}/%{name}.pem
fi
if [ -f /usr/share/ssl/private/dovecot.pem -a ! -f %{ssldir}/private/%{name}.pem ]; then
mv /usr/share/ssl/private/dovecot.pem %{ssldir}/private/%{name}.pem
fi
if [ ! -f %{ssldir}/%{name}.pem ]; then
%{docdir}/examples/mkcert.sh &> /dev/null %{docdir}/examples/mkcert.sh &> /dev/null
fi fi
# Restart if it had been running before installation # Restart if it had been running before installation
@ -153,7 +161,7 @@ rm -rf $RPM_BUILD_ROOT
%config %{_sysconfdir}/rc.d/init.d/dovecot %config %{_sysconfdir}/rc.d/init.d/dovecot
%config %{_sysconfdir}/pam.d/dovecot %config %{_sysconfdir}/pam.d/dovecot
%config(noreplace) %{ssldir}/dovecot-openssl.cnf %config(noreplace) %{ssldir}/dovecot-openssl.cnf
%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/certs/dovecot.pem %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/dovecot.pem
%attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/private/dovecot.pem %attr(0600,root,root) %ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{ssldir}/private/dovecot.pem
%dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/* %{_libexecdir}/%{name}/*
@ -164,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Apr 22 2005 John Dennis <jdennis@redhat.com> - 0.99.14-4.fc4
- openssl moved its certs, CA, etc. from /usr/share/ssl to /etc/pki
* Tue Apr 12 2005 Tom Lane <tgl@redhat.com> 0.99.14-3.fc4 * Tue Apr 12 2005 Tom Lane <tgl@redhat.com> 0.99.14-3.fc4
- Rebuild for Postgres 8.0.2 (new libpq major version). - Rebuild for Postgres 8.0.2 (new libpq major version).