1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/plainpad_ynh.git synced 2024-09-03 20:05:53 +02:00

Merge branch 'testing' into Add-config-panel

This commit is contained in:
ericgaspar 2022-04-08 16:38:48 +02:00
commit e82d903f10
No known key found for this signature in database
GPG key ID: 574F281483054D44
4 changed files with 15 additions and 11 deletions

View file

@ -6,7 +6,7 @@ APP_NAME=Plainpad
# This value determines the "environment" your application is currently # This value determines the "environment" your application is currently
# running in. This may determine how you prefer to configure various # running in. This may determine how you prefer to configure various
# services the application utilizes. Set this in your ".env" file. # services the application utilizes. Set this in your ".env" file.
APP_ENV=production APP_ENV=local
# This key is used by the Illuminate encrypter service and should be set # This key is used by the Illuminate encrypter service and should be set
# to a random, 32 character string, otherwise these encrypted strings # to a random, 32 character string, otherwise these encrypted strings

View file

@ -3,8 +3,8 @@
"id": "plainpad", "id": "plainpad",
"packaging_format": 1, "packaging_format": 1,
"description": { "description": {
"en": "Self hosted, note taking application", "en": "Note taking application",
"fr": "Application de prise de notes auto-hébergée" "fr": "Prise de notes auto-hébergée"
}, },
"version": "1.0.0~ynh2", "version": "1.0.0~ynh2",
"url": "https://alextselegidis.com/get/plainpad", "url": "https://alextselegidis.com/get/plainpad",

View file

@ -122,7 +122,7 @@ chown $app:$app "$final_path/.env"
ynh_script_progression --message="Migrating database..." --weight=1 ynh_script_progression --message="Migrating database..." --weight=1
pushd "$final_path" pushd "$final_path"
php$phpversion artisan migrate:fresh --seed php$phpversion artisan migrate:fresh -n --seed
popd popd
#================================================= #=================================================
@ -145,6 +145,7 @@ if [ $is_public -eq 1 ]
then then
ynh_permission_update --permission="main" --add="visitors" ynh_permission_update --permission="main" --add="visitors"
fi fi
ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --auth_header="false" --show_tile="false" --protected="true" ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --auth_header="false" --show_tile="false" --protected="true"
#================================================= #=================================================

View file

@ -73,13 +73,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
#================================================= #=================================================
# REINSTALL DEPENDENCIES # REINSTALL DEPENDENCIES
#================================================= #=================================================
@ -88,6 +81,16 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=1
# Define and install dependencies # Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
#=================================================
# RESTORE THE PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
# Recreate a dedicated PHP-FPM config
ynh_add_fpm_config
#================================================= #=================================================
# RESTORE THE MYSQL DATABASE # RESTORE THE MYSQL DATABASE
#================================================= #=================================================