YunoHost-Apps/piwigo_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/piwigo_ynh.git synced 2024-09-03 20:06:03 +02:00
Code Issues Activity Actions 1

Move actual data directories to /home/yunohost.app (used to move galleries directory instead of _data directory)

Browse source
This commit is contained in:
Jimmy Monin 2017-10-01 21:59:40 +02:00
parent 8194d574c1
commit 7812409128
2 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/install
View file

@ -104,20 +104,18 @@ ynh_system_user_create $app # Create a dedicated system user
# Install files and set permissions # Install files and set permissions
mkdir $final_path mkdir $final_path
cp -a $TMPDIR/!(upload|galleries) $final_path cp -a $TMPDIR/!(upload|_data) $final_path
datapath=/home/yunohost.app/$app datapath=/home/yunohost.app/$app
mkdir -p $datapath mkdir -p $datapath/_data
mkdir -p $datapath/galleries
mkdir -p $datapath/upload mkdir -p $datapath/upload
ln -sd $datapath/galleries $final_path/galleries ln -sd $datapath/_data $final_path/_data
cp -a $TMPDIR/galleries/* $final_path/galleries/
ln -sd $datapath/upload $final_path/upload ln -sd $datapath/upload $final_path/upload
chown -R $app: $final_path chown -R $app: $final_path
chown -R $app: $datapath chown -R $app: $datapath
chmod 755 -R $final_path/galleries chmod 755 -R $final_path/_data
#================================================= #=================================================
# NGINX AND PHP-FPM CONFIGURATION # NGINX AND PHP-FPM CONFIGURATION

32
scripts/upgrade
View file

@ -57,7 +57,7 @@ admin_pwd=$(ynh_app_setting_get "$app" admin_pwd)
# Compatibility with previous version; password was not set # Compatibility with previous version; password was not set
if [ -z "$admin_pwd" ] ; then if [ -z "$admin_pwd" ] ; then
# Generate a new password # Generate a new password
admin_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p') admin_pwd=$(ynh_string_random 24)
# Compute password hash with the Piwigo function # Compute password hash with the Piwigo function
cp ../conf/hash_password.php $final_path cp ../conf/hash_password.php $final_path
@ -122,14 +122,34 @@ ynh_system_user_create $app # Create dedicated user if not existing
# SPECIFIC SETUP # SPECIFIC SETUP
#================================================= #=================================================
# Install files and set permissions # We store photos (potentially large data) on /home/yunohost.app
cp -a $TMPDIR/!(upload|galleries) $final_path datapath=/home/yunohost.app/$app
# Backward compatibility:
# If the galleries subdirectory was moved,
# remove the link and overwrite it
# (this directory always includes only a single index.php file...)
if [ -h $final_path/galleries ] ; then
rm -f $final_path/galleries # only a symbolic link, ynh_secure_remove can't handle that
ynh_secure_remove $datapath/galleries
fi
# Install files and set permissions
cp -a $TMPDIR/!(upload|_data) $final_path
# Backward compatibility:
# If the _data subdirectory wasn't already moved to /home/yunohost.app/$app,
# then move it there
if [ ! -h $final_path/_data ] ; then
mv $final_path/_data $datapath
ln -sd $datapath/_data $final_path/_data
fi
cp -a $TMPDIR/galleries/* $final_path/galleries/
chown -R $app: $final_path chown -R $app: $final_path
chown -R $app: /home/yunohost.app/$app chown -R $app: $datapath
chmod 755 -R $final_path/galleries chmod 755 -R $final_path/_data
#================================================= #=================================================
# NGINX AND PHP-FPM CONFIGURATION # NGINX AND PHP-FPM CONFIGURATION