diff --git a/.gitignore b/.gitignore index 8a9a18f..6852bbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /prosody-*.tar.gz +/prosody-*.tar.gz.asc diff --git a/prosody-0.9.8-config.patch b/prosody-0.9.8-config.patch index 9cf318c..610fe38 100644 --- a/prosody-0.9.8-config.patch +++ b/prosody-0.9.8-config.patch @@ -50,13 +50,12 @@ comments about optional dependencies and finally includes some upstream recommen - info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging - error = "prosody.err"; - -- "*syslog"; -- Uncomment this for logging to syslog -- -- "*console"; -- Log to the console, useful for debugging with daemonize=false + -- Log everything of level "info" and higher (that is, all except "debug" messages) + -- to /var/log/prosody/prosody.log and errors also to /var/log/prosody/prosody.err + info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging + error = "/var/log/prosody/prosody.err"; -- Log errors also to file + -- error = "*syslog"; -- Log errors also to syslog -+ -- log = "*console"; -- Log to the console, useful for debugging with daemonize=false + -- "*console"; -- Log to the console, useful for debugging with daemonize=false } ------------ Virtual hosts ----------- diff --git a/prosody.spec b/prosody.spec index ba1f609..5cc3f5b 100644 --- a/prosody.spec +++ b/prosody.spec @@ -10,13 +10,14 @@ License: MIT Group: System Environment/Daemons URL: https://prosody.im/ Source0: https://prosody.im/downloads/source/%{name}-%{version}.tar.gz -Source1: prosody.init -Source2: prosody.logrotate-init -Source3: prosody.service -Source4: prosody.logrotate-service -Source5: prosody.tmpfilesd -Source6: prosody-localhost.cfg.lua -Source7: prosody-example.com.cfg.lua +Source1: https://prosody.im/downloads/source/%{name}-%{version}.tar.gz.asc +Source2: prosody.init +Source3: prosody.logrotate-init +Source4: prosody.service +Source5: prosody.logrotate-service +Source6: prosody.tmpfilesd +Source7: prosody-localhost.cfg.lua +Source8: prosody-example.com.cfg.lua Patch0: prosody-0.9.8-config.patch Patch1: prosody-0.9.8-rhel5.patch BuildRequires: libidn-devel, openssl-devel @@ -108,13 +109,13 @@ ln -s ../pki/%{name}/ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/certs # Install systemd/tmpfiles or initscript files %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 -install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service -install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} -install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf +install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service +install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} +install -D -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf mkdir -p $RPM_BUILD_ROOT/run/%{name} %else -install -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} -install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} +install -D -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} +install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name} sed -e 's@/run@%{_localstatedir}/run@' -i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/prosody.cfg.lua %endif @@ -123,8 +124,8 @@ sed -e 's@/run@%{_localstatedir}/run@' -i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ touch -c -r prosody.cfg.lua.dist.config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/prosody.cfg.lua # Install virtual host configuration -install -D -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d/localhost.cfg.lua -install -D -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d/example.com.cfg.lua +install -D -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d/localhost.cfg.lua +install -D -p -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d/example.com.cfg.lua # Fix permissions for rpmlint chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/util/*.so diff --git a/sources b/sources index 630b1e4..ad7472a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (prosody-0.9.12.tar.gz) = e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76 +SHA512 (prosody-0.9.12.tar.gz.asc) = cca198f658aa50c08b59f4249e6799b6dcfaad9bfee8f2d98f7816076ef3cf0cf6789934baeaf0af3033d7523b5a27312aa9935aac84108fcdf9b9ffee7c8ab6