1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/tiddlywiki_ynh.git synced 2024-09-03 20:26:34 +02:00

Merge branch 'patch' into testing

This commit is contained in:
ericgaspar 2021-05-28 13:27:37 +02:00
commit c0eccc2511
No known key found for this signature in database
GPG key ID: 574F281483054D44
8 changed files with 18 additions and 24 deletions

BIN
.DS_Store vendored Normal file

Binary file not shown.

BIN
doc/.DS_Store vendored Normal file

Binary file not shown.

BIN
doc/screenshots/.DS_Store vendored Normal file

Binary file not shown.

View file

Before

Width:  |  Height:  |  Size: 169 KiB

After

Width:  |  Height:  |  Size: 169 KiB

View file

@ -8,6 +8,13 @@
}, },
"version": "5.1.23~ynh2", "version": "5.1.23~ynh2",
"url": "https://tiddlywiki.com/", "url": "https://tiddlywiki.com/",
"upstream": {
"license": "BSD-2-Clause",
"website": "https://tiddlywiki.com/",
"demo": "https://tiddlywiki.com/",
"admindoc": "https://tiddlywiki.com/",
"code": "https://github.com/Jermolene/TiddlyWiki5"
},
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"maintainer": { "maintainer": {
"name": "eric_G", "name": "eric_G",

View file

@ -87,6 +87,10 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
# 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
chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path"
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
#================================================= #=================================================
@ -116,15 +120,6 @@ ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" --
ynh_add_systemd_config ynh_add_systemd_config
#=================================================
# GENERIC FINALIZATION
#=================================================
# SECURE FILES AND DIRECTORIES
#=================================================
# Set permissions to app files
chown -R $app:$app $final_path
#================================================= #=================================================
# ADVERTISE SERVICE IN ADMIN PANEL # ADVERTISE SERVICE IN ADMIN PANEL
#================================================= #=================================================

View file

@ -64,12 +64,9 @@ ynh_script_progression --message="Recreating the dedicated system user..." --wei
# Create the dedicated user (if not existing) # Create the dedicated user (if not existing)
ynh_system_user_create --username=$app --home_dir=$final_path ynh_system_user_create --username=$app --home_dir=$final_path
#================================================= chmod 750 "$final_path"
# RESTORE USER RIGHTS chmod -R o-rwx "$final_path"
#================================================= chown -R $app:www-data "$final_path"
# Restore permissions on app files
chown -R $app:$app $final_path
#================================================= #=================================================
# SPECIFIC RESTORATION # SPECIFIC RESTORATION

View file

@ -93,6 +93,10 @@ then
popd popd
fi fi
chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path"
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
#================================================= #=================================================
@ -118,15 +122,6 @@ ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" --
ynh_add_systemd_config ynh_add_systemd_config
#=================================================
# GENERIC FINALIZATION
#=================================================
# SECURE FILES AND DIRECTORIES
#=================================================
# Set permissions on app files
chown -R $app:$app $final_path
#================================================= #=================================================
# ADVERTISE SERVICE IN ADMIN PANEL # ADVERTISE SERVICE IN ADMIN PANEL
#================================================= #=================================================