diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..6e268bd Binary files /dev/null and b/.DS_Store differ diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/README.md b/README.md index 18765b8..840720f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ *[Lire ce readme en français.](./README_fr.md)* > *This package allow you to install TiddlyWiki quickly and simply on a YunoHost server. -If you don’t have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +If you don’t have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* ## Overview TiddlyWiki is a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation. @@ -29,8 +29,8 @@ TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a sin #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/tiddlywiki%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/tiddlywiki/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/tiddlywiki%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/tiddlywiki/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/tiddlywiki.svg)](https://ci-apps.yunohost.org/ci/apps/tiddlywiki/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/tiddlywiki.svg)](https://ci-apps-arm.yunohost.org/ci/apps/tiddlywiki/) ## Links diff --git a/README_fr.md b/README_fr.md index a050010..e44354d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,7 +6,7 @@ *[Read this readme in english.](./README.md)* > *Ce package vous permet d’installer TiddlyWiki rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble TiddlyWiki est un cahier Web personnel non linéaire que tout le monde peut utiliser et conserver pour toujours, indépendamment de toute entreprise. @@ -29,8 +29,8 @@ TiddlyWiki est un wiki interactif complet en JavaScript. Il peut être utilisé #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/tiddlywiki%40%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/tiddlywiki/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/tiddlywiki%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/tiddlywiki/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/tiddlywiki.svg)](https://ci-apps.yunohost.org/ci/apps/tiddlywiki/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/tiddlywiki.svg)](https://ci-apps-arm.yunohost.org/ci/apps/tiddlywiki/) ## Liens diff --git a/check_process b/check_process index d716fdb..ec2cd69 100644 --- a/check_process +++ b/check_process @@ -1,12 +1,12 @@ ;; Test complet auto_remove=1 ; Manifest - domain="domain.tld" (DOMAIN) - path="/" (PATH) - admin="john" (USER) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/" + admin="john" + is_public=1 password="password" - port="8095" (PORT) + port="8095" ; Checks pkg_linter=1 setup_sub_dir=0 @@ -15,6 +15,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=befb3426e13fb5f094c2cc1b6841de202506c6fa backup_restore=1 multi_instance=0 change_url=1 @@ -22,6 +23,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. + ; commit=befb3426e13fb5f094c2cc1b6841de202506c6fa + name=Merge pull request #4 from YunoHost-Apps/testing manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&password=password&port=8095& diff --git a/conf/systemd.service b/conf/systemd.service index 61a84f6..e5a3e1c 100755 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__FINALPATH__ Environment=PATH=__ENV_PATH__ Environment=NODE_ENV=production -ExecStart=__YNH_NODE__ tiddlywiki mynewwiki --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ +ExecStart=__YNH_NODE__ tiddlywiki ++languages/fr-FR mynewwiki --listen port=__PORT__ username=__ADMIN__ password=__PASSWORD__ Restart=always [Install] diff --git a/doc/.DS_Store b/doc/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/doc/.DS_Store differ diff --git a/doc/screenshots/.DS_Store b/doc/screenshots/.DS_Store new file mode 100644 index 0000000..9a8f43d Binary files /dev/null and b/doc/screenshots/.DS_Store differ 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 de1b6ce..7ac9bec 100644 --- a/manifest.json +++ b/manifest.json @@ -6,15 +6,22 @@ "en": "A non-linear personal web notebook", "fr": "Un carnet Web personnel non linéaire" }, - "version": "5.1.23~ynh2", + "version": "5.1.23~ynh3", "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", "email": "" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.4" }, "multi_instance": false, "services": [ diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index 43a5f34..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 #================================================= @@ -113,21 +117,9 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1 ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file=../conf/systemd.service ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" --target_file=../conf/systemd.service -ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file=../conf/systemd.service -ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file=../conf/systemd.service -ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file=../conf/systemd.service 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 77b5bb8..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 #================================================= @@ -115,21 +119,9 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file=../conf/systemd.service ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" --target_file=../conf/systemd.service -ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file=../conf/systemd.service -ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file=../conf/systemd.service -ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file=../conf/systemd.service 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 #=================================================