rpms/uwsgi
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use systemd tmpfiles to create /run/uwsgi with group write permissions (rhbz#1427303)

Browse Source
This commit is contained in:
Carl George 2018-07-08 20:26:31 -05:00
parent 0d6a6e469d
commit 509df149e9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
uwsgi.service
View File

@ -4,8 +4,6 @@ After=syslog.target
[Service] [Service]
EnvironmentFile=-/etc/sysconfig/uwsgi EnvironmentFile=-/etc/sysconfig/uwsgi
ExecStartPre=/bin/mkdir -p /run/uwsgi
ExecStartPre=/bin/chown uwsgi:uwsgi /run/uwsgi
ExecStart=/usr/sbin/uwsgi --ini /etc/uwsgi.ini ExecStart=/usr/sbin/uwsgi --ini /etc/uwsgi.ini
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
KillSignal=SIGINT KillSignal=SIGINT

6
uwsgi.spec
View File

@ -131,6 +131,7 @@ Source3: emperor.ini
Source4: https://github.com/unbit/%{docrepo}/archive/%{commit}/%{docrepo}-%{shortcommit}.tar.gz Source4: https://github.com/unbit/%{docrepo}/archive/%{commit}/%{docrepo}-%{shortcommit}.tar.gz
Source5: README.Fedora Source5: README.Fedora
Source6: uwsgi.init Source6: uwsgi.init
Source7: uwsgi.tmpfiles
Patch0: uwsgi_trick_chroot_rpmbuild.patch Patch0: uwsgi_trick_chroot_rpmbuild.patch
Patch1: uwsgi_fix_rpath.patch Patch1: uwsgi_fix_rpath.patch
Patch2: uwsgi_ruby20_compatibility.patch Patch2: uwsgi_ruby20_compatibility.patch
@ -1290,7 +1291,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/uwsgi.d
mkdir -p %{buildroot}%{_usrsrc}/uwsgi/%{version} mkdir -p %{buildroot}%{_usrsrc}/uwsgi/%{version}
mkdir -p %{buildroot}%{_includedir}/uwsgi mkdir -p %{buildroot}%{_includedir}/uwsgi
mkdir -p %{buildroot}%{_libdir}/uwsgi mkdir -p %{buildroot}%{_libdir}/uwsgi
mkdir -p %{buildroot}/run/uwsgi
%if %{with mono} %if %{with mono}
mkdir -p %{buildroot}%{_monogacdir} mkdir -p %{buildroot}%{_monogacdir}
%endif %endif
@ -1330,6 +1330,7 @@ gacutil -i plugins/mono/uwsgi.dll -f -package uwsgi -root %{buildroot}/usr/lib
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/uwsgi.ini install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/uwsgi.ini
%if %{with systemd} %if %{with systemd}
install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/uwsgi.service install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/uwsgi.service
install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/uwsgi.conf
%else %else
install -D -p -m 0755 %{SOURCE6} %{buildroot}%{_initddir}/uwsgi install -D -p -m 0755 %{SOURCE6} %{buildroot}%{_initddir}/uwsgi
%endif %endif
@ -1404,11 +1405,11 @@ fi
%config(noreplace) %{_sysconfdir}/uwsgi.ini %config(noreplace) %{_sysconfdir}/uwsgi.ini
%if %{with systemd} %if %{with systemd}
%config %{_unitdir}/uwsgi.service %config %{_unitdir}/uwsgi.service
%{_tmpfilesdir}/uwsgi.conf
%else %else
%{_initddir}/uwsgi %{_initddir}/uwsgi
%endif %endif
%dir %{_sysconfdir}/uwsgi.d %dir %{_sysconfdir}/uwsgi.d
%dir /run/uwsgi
%doc README README.Fedora CHANGELOG %doc README README.Fedora CHANGELOG
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license LICENSE %license LICENSE
@ -1805,6 +1806,7 @@ fi
* Mon Jul 09 2018 Carl George <carl@george.computer> - 2.0.17.1-1 * Mon Jul 09 2018 Carl George <carl@george.computer> - 2.0.17.1-1
- Latest upstream (rhbz#1549354) - Latest upstream (rhbz#1549354)
- Enable uwsgi-plugin-coroae on EL7 - Enable uwsgi-plugin-coroae on EL7
- Use systemd tmpfiles to create /run/uwsgi with group write permissions (rhbz#1427303)
* Tue Jul 03 2018 Petr Pisar <ppisar@redhat.com> - 2.0.16-7 * Tue Jul 03 2018 Petr Pisar <ppisar@redhat.com> - 2.0.16-7
- Perl 5.28 rebuild - Perl 5.28 rebuild

1
uwsgi.tmpfiles Normal file
View File

@ -0,0 +1 @@
d /run/uwsgi 0775 uwsgi uwsgi