Kolab Groupware OBS

Changes of Revision 26

cyrus-imapd.spec Changed

@@ -375,11 +375,6 @@
   -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 
 %post
-%if 0%{?with_systemd}
-%else
-    /sbin/chkconfig --add %{_name}
-%endif
-
 CHATTRSYNC=0
 
 if [ -f "%{_sysconfdir}/sysconfig/cyrus-imapd" ]; then
@@ -397,10 +392,10 @@
 # Create SSL certificates
 exec > /dev/null 2> /dev/null
 
-if [ ! -f %{ssl_pem_file} ]; then
-pushd %{_sysconfdir}/pki/tls/certs
-umask 077
-%{__cat} << EOF | make %{_name}.pem
+if [ ! -f %{ssl_pem_file} -a -d "%{_sysconfdir}/pki/tls/certs" ]; then
+    pushd %{_sysconfdir}/pki/tls/certs
+    umask 077
+    %{__cat} << EOF | make %{_name}.pem
 --
 SomeState
 SomeCity
@@ -409,13 +404,18 @@
 localhost.localdomain
 root@localhost.localdomain
 EOF
-%{__chown} root.%{_cyrusgroup} %{_name}.pem
-%{__chmod} 640 %{_name}.pem
-mv %{_name}.pem %{ssl_pem_file}
-popd
+
+    %{__chown} root.%{_cyrusgroup} %{_name}.pem
+    %{__chmod} 640 %{_name}.pem
+    mv %{_name}.pem %{ssl_pem_file}
+    popd
 fi
 
-%systemd_post cyrus-imapd.service
+%if 0%{?with_systemd}
+    %systemd_post cyrus-imapd.service
+%else
+    /sbin/chkconfig --add %{_name}
+%endif
 
 %preun
 %if 0%{?with_systemd}