nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Addding uploads directory

Browse source
This commit is contained in:
Alec Leamas 2010-10-06 23:15:52 +02:00
parent 8ab97fe3f1
commit 09a931d4fd
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/fedora/README.md
View file

@ -81,3 +81,8 @@ bundle, containing some C extensions, is architecture-dependent and lives
in /usr/lib[64]/diaspora. Log files are in /var/log/diaspora. Symlinks in in /usr/lib[64]/diaspora. Log files are in /var/log/diaspora. Symlinks in
/usr/share diaspora makes log and bundle available as expected by diaspora app. /usr/share diaspora makes log and bundle available as expected by diaspora app.
This is more or less as mandated by LSB and Fedora packaging rules. This is more or less as mandated by LSB and Fedora packaging rules.
find /usr/share/diaspora/ -type l -exec ls -l {} \; | awk '{print $9, $10, $11}'
/usr/share/diaspora/master/public/uploads -> /var/lib/diaspora/uploads
/usr/share/diaspora/master/log -> /var/log/diaspora
/usr/share/diaspora/master/vendor/bundle -> /usr/lib/diaspora-bundle/master/vendor/bundle

3
pkg/fedora/diaspora-setup
View file

@ -27,6 +27,9 @@ else
exit 1 exit 1
fi fi
# %attr(0777, diaspora, apache) doesn't work in specfile due to umask 022.
chmod 777 /var/lib/diaspora/uploads
hostname=$( awk '/pod_url:/ { print $2; exit }' <config/app_config.yml) hostname=$( awk '/pod_url:/ { print $2; exit }' <config/app_config.yml)
while : ; do while : ; do
echo "Current hostname is \"$hostname\"" echo "Current hostname is \"$hostname\""

11
pkg/fedora/diaspora.spec
View file

@ -47,7 +47,7 @@ pushd master
popd popd
%pre %pre
getent group apache >/dev/null || groupadd -r apache getent group diaspora >/dev/null || groupadd -r diaspora
getent passwd diaspora >/dev/null || \ getent passwd diaspora >/dev/null || \
useradd -r -g apache \ useradd -r -g apache \
-md /usr/share/diaspora -s /sbin/nologin \ -md /usr/share/diaspora -s /sbin/nologin \
@ -70,15 +70,19 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
cp master/.gitignore $RPM_BUILD_ROOT/%{_datadir}/diaspora/master cp master/.gitignore $RPM_BUILD_ROOT/%{_datadir}/diaspora/master
cp diaspora-setup $RPM_BUILD_ROOT/%{_datadir}/diaspora cp diaspora-setup $RPM_BUILD_ROOT/%{_datadir}/diaspora
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads
%post %post
rm -f %{_datadir}/diaspora/master/vendor/bundle rm -f %{_datadir}/diaspora/master/vendor/bundle
rm -f %{_datadir}/diaspora/master/log rm -f %{_datadir}/diaspora/master/log
rm -f %{_datadir}/diaspora/master/public/uploads
ln -s %{_localstatedir}/log/diaspora \ ln -s %{_localstatedir}/log/diaspora \
%{_datadir}/diaspora/master/log || : %{_datadir}/diaspora/master/log || :
ln -s %{_libdir}/diaspora-bundle/master/vendor/bundle \ ln -s %{_libdir}/diaspora-bundle/master/vendor/bundle \
%{_datadir}/diaspora/master/vendor || : %{_datadir}/diaspora/master/vendor || :
ln -s %{_localstatedir}/lib/diaspora/uploads \
%{_datadir}/diaspora/master/public/uploads || :
/sbin/chkconfig --add diaspora-ws /sbin/chkconfig --add diaspora-ws
%preun %preun
@ -93,8 +97,9 @@ fi
%files %files
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%doc README.md GNU-AGPL-3.0 %doc README.md GNU-AGPL-3.0
%attr(0555, diaspora, apache) %{_datadir}/diaspora %attr(0555, diaspora, diaspora) %{_datadir}/diaspora
%attr(0755, diaspora, apache) %{_localstatedir}/log/diaspora %attr(-, diaspora, diaspora) %{_localstatedir}/log/diaspora
%attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/uploads
%config(noreplace) %{_sysconfdir}/logrotate.d/diaspora %config(noreplace) %{_sysconfdir}/logrotate.d/diaspora
%{_sysconfdir}/init.d/diaspora-ws %{_sysconfdir}/init.d/diaspora-ws