RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: eliminate ceph-rgw tmpfiles.d file

Browse Source 
This is for storing the rgw socket files for fastcgi, which we do not
want to enable by default.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-09-14 13:52:11 -04:00
parent 367c794cb1
commit 8e13d89f0f
6 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -52,7 +52,6 @@ missing
py-compile
release
stamp-h1
systemd/ceph-rgw.tmpfiles.d
systemd/Makefile
vgcore.*

4
ceph.spec.in
View File

@ -595,7 +595,6 @@ install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
install -m 0644 -D etc/sysconfig/ceph $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ceph
%if 0%{?_with_systemd}
install -m 0644 -D systemd/ceph.tmpfiles.d $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
install -m 0644 -D systemd/ceph-rgw.tmpfiles.d $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}-rgw.conf
install -m 0644 -D systemd/ceph-osd@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-osd@.service
install -m 0644 -D systemd/ceph-mon@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-mon@.service
install -m 0644 -D systemd/ceph-create-keys@.service $RPM_BUILD_ROOT%{_unitdir}/ceph-create-keys@.service
@ -916,7 +915,6 @@ fi
%dir %{_localstatedir}/log/radosgw/
%dir %{_localstatedir}/lib/ceph/radosgw
%if 0%{?_with_systemd}
%{_tmpfilesdir}/%{name}-rgw.conf
%else
%{_initrddir}/ceph-radosgw
%{_sbindir}/rcceph-radosgw
@ -925,8 +923,6 @@ fi
%post radosgw
/sbin/ldconfig
%if 0%{?suse_version}
# TODO: find out what exactly this systemd-tmpfiles inovcation is for
systemd-tmpfiles --create /%{_tmpfilesdir}/ceph-rgw.conf
# explicit systemctl daemon-reload (that's the only relevant bit of
# service_add_post; the rest is all sysvinit --> systemd migration which
# isn't applicable in this context (see above comment).

1
configure.ac
View File

@ -1342,6 +1342,5 @@ AC_CONFIG_FILES([Makefile
man/Makefile
doc/Makefile
selinux/Makefile
systemd/ceph-rgw.tmpfiles.d
ceph.spec])
AC_OUTPUT

2
debian/rules vendored
View File

@ -153,8 +153,6 @@ binary-arch: build install
install -d -m0755 debian/radosgw/lib/systemd/system
install -m0644 systemd/ceph-radosgw@.service debian/radosgw/lib/systemd/system
sed -i s./etc/sysconfig/./etc/default/.g debian/radosgw/lib/systemd/system/ceph-radosgw@.service
install -d -m0755 debian/radosgw/usr/lib/tmpfiles.d
install -m 0644 -D systemd/ceph-rgw.tmpfiles.d debian/radosgw/usr/lib/tmpfiles.d/ceph-rgw.conf
dh_installman -a
dh_lintian -a

1
systemd/Makefile.am
View File

@ -15,5 +15,4 @@ EXTRA_DIST = \
$(unitfiles) \
ceph \
ceph.tmpfiles.d \
ceph-rgw.tmpfiles.d.in \
ceph-radosgw-prestart.sh

2
systemd/ceph-rgw.tmpfiles.d.in
View File

@ -1,2 +0,0 @@
# create rgw socket directory
d /run/ceph-rgw 0755 @user_rgw@ @group_rgw@ - -