diff --git a/prosody.logrotate-init b/prosody.logrotate-init index 6021207..501c2f7 100644 --- a/prosody.logrotate-init +++ b/prosody.logrotate-init @@ -4,7 +4,7 @@ delaycompress notifempty postrotate - /sbin/service prosody reload > /dev/null || true + /sbin/service prosody status > /dev/null 2>&1 && /sbin/service prosody reload > /dev/null || true endscript create 0640 prosody prosody sharedscripts diff --git a/prosody.logrotate-service b/prosody.logrotate-service index d824bef..5c2bd0f 100644 --- a/prosody.logrotate-service +++ b/prosody.logrotate-service @@ -4,7 +4,7 @@ delaycompress notifempty postrotate - /bin/systemctl reload prosody.service > /dev/null || true + /bin/systemctl --quiet is-active prosody.service && /bin/systemctl reload prosody.service || true endscript create 0640 prosody prosody sharedscripts diff --git a/prosody.spec b/prosody.spec index 60bdc5a..540fdcd 100644 --- a/prosody.spec +++ b/prosody.spec @@ -5,7 +5,7 @@ Summary: Flexible communications server for Jabber/XMPP Name: prosody Version: 0.10.2 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: System Environment/Daemons URL: https://prosody.im/ @@ -82,7 +82,6 @@ make %{?_smp_mflags} make -C tools/migration %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir}/pki,%{_localstatedir}/{lib,log}/%{name}}/ make DESTDIR=$RPM_BUILD_ROOT install @@ -143,7 +142,7 @@ exit 0 if [ ! -f %{sslkey} ]; then umask 077 - %{_bindir}/openssl genrsa 2048 > %{sslkey} 2> /dev/null + %{_bindir}/openssl genrsa 4096 > %{sslkey} 2> /dev/null chown root:%{name} %{sslkey} chmod 640 %{sslkey} fi @@ -154,15 +153,8 @@ if [ ! -f %{sslcert} ]; then FQDN=localhost.localdomain fi - cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} -x509 -sha256 -days 365 -set_serial $RANDOM -out %{sslcert} 2> /dev/null --- -SomeState -SomeCity -SomeOrganization -SomeOrganizationalUnit -${FQDN} -root@${FQDN} -EOF + %{_bindir}/openssl req -new -key %{sslkey} -x509 -sha256 -days 365 -set_serial $RANDOM -out %{sslcert} \ + -subj "/C=--/ST=SomeState/L=SomeCity/O=SomeOrganization/OU=SomeOrganizationalUnit/CN=${FQDN}/emailAddress=root@${FQDN}" chmod 644 %{sslcert} fi @@ -215,6 +207,9 @@ fi %{_mandir}/man1/%{name}*.1* %changelog +* Sun Aug 19 2018 Robert Scheck 0.10.2-3 +- Don't attempt to reload during logrotate if prosody is stopped + * Fri Jul 13 2018 Fedora Release Engineering - 0.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild