From 7a39bc7e20cbad926b50a17b29951fd4148b6ad5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 May 2021 11:34:56 +0200 Subject: [PATCH] Fix --- .DS_Store | Bin 0 -> 6148 bytes doc/.DS_Store | Bin 0 -> 6148 bytes doc/screenshots/.DS_Store | Bin 0 -> 6148 bytes screenshot.png => doc/screenshots/screenshot.png | Bin manifest.json | 7 +++++++ scripts/install | 13 ++++--------- scripts/restore | 9 +++------ scripts/upgrade | 13 ++++--------- 8 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 .DS_Store create mode 100644 doc/.DS_Store create mode 100644 doc/screenshots/.DS_Store rename screenshot.png => doc/screenshots/screenshot.png (100%) diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6e268bd83a79ea774265a34bc3bc303aab7418d4 GIT binary patch literal 6148 zcmeHK&1%~~5Z<-jR;ohKA%#F&(7idh1UESfC%KeD4GPYoDXvs4^@7+9l57)84sW>)%E>}nZfyg$hwGZr$&JW#}z56y1` z$5B_L#DN>k6)I6aXn*R#H!sJuG8UU(GV88emKUt`Q_{l`1H{0; zU;y`r2oy1P*jO}M2Q>Kmh~phZ6tM9wffzZA9X1wW1ccjEK%2_l6@%M!@JB8#cGy_7 z>5QA1p^lrGyBi8Ovx7e};f%)?sU-%8ftw7pZ8ya8|LD*6|C>qFBL;|p|B3P$S@v&;X1bHWtAHLO%kA25N|bzskT* DHv(_< literal 0 HcmV?d00001 diff --git a/doc/.DS_Store b/doc/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0+AK3uT;Ht_Hy298~ujI mhG@maXvJK3D?Zz+YyQmrzHm$oI`cs%>PNtJkx7BSP~a2!A|yuu literal 0 HcmV?d00001 diff --git a/screenshot.png b/doc/screenshots/screenshot.png similarity index 100% rename from screenshot.png rename to doc/screenshots/screenshot.png diff --git a/manifest.json b/manifest.json index 4d895a8..0dce7fa 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,13 @@ }, "version": "5.1.23~ynh2", "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", "maintainer": { "name": "eric_G", diff --git a/scripts/install b/scripts/install index 0bd0546..e68d12a 100755 --- a/scripts/install +++ b/scripts/install @@ -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 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 #================================================= @@ -116,15 +120,6 @@ ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" -- 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 #================================================= diff --git a/scripts/restore b/scripts/restore index 7302e83..9b8d0b5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -64,12 +64,9 @@ ynh_script_progression --message="Recreating the dedicated system user..." --wei # Create the dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir=$final_path -#================================================= -# RESTORE USER RIGHTS -#================================================= - -# Restore permissions on app files -chown -R $app:$app $final_path +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index b77a1be..0afd25c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -93,6 +93,10 @@ then popd fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -118,15 +122,6 @@ ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" -- 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 #=================================================