mirror of
https://github.com/YunoHost-Apps/bookstack_ynh.git
synced 2024-09-03 18:16:02 +02:00
Fix
This commit is contained in:
parent
ea70835941
commit
7d58f12b0e
3 changed files with 10 additions and 4 deletions
|
@ -7,7 +7,7 @@
|
||||||
# wrap the entire value in quotes. (eg. MAIL_FROM_NAME="BookStack Mailer")
|
# wrap the entire value in quotes. (eg. MAIL_FROM_NAME="BookStack Mailer")
|
||||||
|
|
||||||
# Application key
|
# Application key
|
||||||
APP_KEY=SomeRandomString
|
APP_KEY=__KEY__
|
||||||
|
|
||||||
# Application URL
|
# Application URL
|
||||||
APP_URL=https://__DOMAIN____PATH__
|
APP_URL=https://__DOMAIN____PATH__
|
||||||
|
|
|
@ -120,6 +120,7 @@ ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_ar
|
||||||
redis_db=$(ynh_redis_get_free_db)
|
redis_db=$(ynh_redis_get_free_db)
|
||||||
ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
|
ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
|
||||||
mail_pwd=$(ynh_string_random --length=12)
|
mail_pwd=$(ynh_string_random --length=12)
|
||||||
|
key=$(ynh_string_random --length=12)
|
||||||
|
|
||||||
ynh_add_config --template=../conf/.env.example --destination=$final_path/.env
|
ynh_add_config --template=../conf/.env.example --destination=$final_path/.env
|
||||||
chmod 600 $final_path/.env
|
chmod 600 $final_path/.env
|
||||||
|
|
|
@ -24,6 +24,8 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
|
||||||
db_user=$db_name
|
db_user=$db_name
|
||||||
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
|
db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
|
||||||
phpversion=$YNH_PHP_VERSION
|
phpversion=$YNH_PHP_VERSION
|
||||||
|
redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)
|
||||||
|
mail_pwd=$(ynh_string_random --length=12)
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# CHECK VERSION
|
# CHECK VERSION
|
||||||
|
@ -64,7 +66,7 @@ then
|
||||||
# Create a temporary directory
|
# Create a temporary directory
|
||||||
tmpdir="$(mktemp -d)"
|
tmpdir="$(mktemp -d)"
|
||||||
|
|
||||||
cp -a "$final_path/.env " "$tmpdir/.env "
|
#cp -a "$final_path/.env " "$tmpdir/.env "
|
||||||
cp -a "$final_path/public/uploads" "$tmpdir/public/uploads"
|
cp -a "$final_path/public/uploads" "$tmpdir/public/uploads"
|
||||||
cp -a "$final_path/storage/uploads" "$tmpdir/storage/uploads"
|
cp -a "$final_path/storage/uploads" "$tmpdir/storage/uploads"
|
||||||
# Remove the app directory securely
|
# Remove the app directory securely
|
||||||
|
@ -73,7 +75,7 @@ then
|
||||||
# Download, check integrity, uncompress and patch the source from app.src
|
# Download, check integrity, uncompress and patch the source from app.src
|
||||||
ynh_setup_source --dest_dir="$final_path"
|
ynh_setup_source --dest_dir="$final_path"
|
||||||
|
|
||||||
cp -a "$tmpdir/.env " "$final_path/.env "
|
#cp -a "$tmpdir/.env " "$final_path/.env "
|
||||||
cp -a "$tmpdir/public/uploads" "$final_path/public/uploads"
|
cp -a "$tmpdir/public/uploads" "$final_path/public/uploads"
|
||||||
cp -a "$tmpdir/storage/uploads" "$final_path/storage/uploads"
|
cp -a "$tmpdir/storage/uploads" "$final_path/storage/uploads"
|
||||||
|
|
||||||
|
@ -81,7 +83,10 @@ then
|
||||||
ynh_secure_remove --file="$tmpdir"
|
ynh_secure_remove --file="$tmpdir"
|
||||||
|
|
||||||
# Download, check integrity, uncompress and patch the source from app.src
|
# Download, check integrity, uncompress and patch the source from app.src
|
||||||
ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/.env $final_path/public/uploads $final_path/storage/uploads"
|
ynh_setup_source --dest_dir="$final_path"
|
||||||
|
|
||||||
|
ynh_add_config --template=../conf/.env.example --destination=$final_path/.env
|
||||||
|
chmod 600 $final_path/.env
|
||||||
fi
|
fi
|
||||||
|
|
||||||
chmod 755 $final_path
|
chmod 755 $final_path
|
||||||
|
|
Loading…
Add table
Reference in a new issue