1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ffsync_ynh.git synced 2024-09-03 18:26:38 +02:00

Merge pull request #3 from Josue-T/patch-1

!conf/upgrade: corrected a recently introduced typo error on the sources copy ; corrected unneeded user creation ; corrected swap file checking that could not get executed.
This commit is contained in:
Pierre-Antoine Rault 2017-03-14 22:13:16 +01:00 committed by GitHub
commit e920c57040

View file

@ -39,7 +39,7 @@ fi
# Patch the 'source' submodule with the 'patch' directory
git submodule init
git submodule update --recursive
sudo cup -a ../patch/sources/* ../sources
sudo cp -a ../patch/sources/* ../sources
# Modify assets to take path into account
sudo find ../sources/syncserver/page/sync_files/ -type f -exec sed -i -e "s@media\/img@$path\/media\/img@g" {} \;
@ -51,7 +51,6 @@ sudo cp ../conf/ffsync /etc/init.d/
sudo cp ../conf/ffsync.logrotate /etc/logrotate.d/ffsync
# Set permissions to ffsync directory
sudo useradd ffsync -d $final_path
sudo chown ffsync:ffsync -R $final_path
# Modify Nginx configuration file and copy it to Nginx conf directory
@ -74,7 +73,7 @@ sudo service ffsync stop
cd $final_path && sudo make build && sudo ./local/bin/easy_install gunicorn
# Disable swapfile
if [ -z ${tmp_swap_file+x} ];
if [ -n ${tmp_swap_file+x} ];
then
sudo swapoff $tmp_swap_file
sudo rm -f $tmp_swap_file