From 6c38f4db1d1dd7943f18ce1d4ced9e791d86cfaf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Nov 2020 13:42:03 +0100 Subject: [PATCH] Fix --- LICENSE.txt => LICENSE | 0 README.md | 71 ++++++++++++++++++++++++++++++++++++++---- check_process | 33 ++++++++++++++++++++ conf/nginx.conf | 7 ++++- scripts/backup | 13 -------- scripts/change_url | 0 6 files changed, 104 insertions(+), 20 deletions(-) rename LICENSE.txt => LICENSE (100%) create mode 100644 check_process create mode 100644 scripts/change_url diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/README.md b/README.md index 67a70c5..d60f156 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,15 @@ -# chtickynotes_ynh : sticky notes for Yunohost # +# Chtickynotes for YunoHost -chtickynotes_ynh is packaged to be installed on a [Yunohost](https://yunohost.org) server. +[![Integration level](https://dash.yunohost.org/integration/chtickynotes.svg)](https://dash.yunohost.org/appci/app/chtickynotes) ![](https://ci-apps.yunohost.org/ci/badges/chtickynotes.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/chtickynotes.maintain.svg) +[![Install chtickynotes with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=chtickynotes) +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install chtickynotes quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* + +## Overview +chtickynotes_ynh core is based on [Post It All!](https://github.com/txusko/PostItAll). chtickynotes_ynh is a "simple post-it" application. Its main features are: - notes movable and resizable - edit note by just typing on it (or CTRL-V to paste chunks of HTML) @@ -9,9 +17,60 @@ chtickynotes_ynh is a "simple post-it" application. Its main features are: - global menu to change board, and so on - autosave every 10 seconds - storage on the server (not on the browser local storage) - -**Screen shot:**
-![Screen shot](https://lh4.googleusercontent.com/-ATC-XA5iVsc/VM06cI3ClLI/AAAAAAAACHo/uBhDViaSBRg/s800/chtickynotes.gif) -chtickynotes_ynh core is based on [Post It All!](https://github.com/txusko/PostItAll). +**Shipped version:** 1.0 +## Screenshots + +![](https://lh4.googleusercontent.com/-ATC-XA5iVsc/VM06cI3ClLI/AAAAAAAACHo/uBhDViaSBRg/s800/chtickynotes.gif) + +## Demo + +* [Official demo](Link to a demo site for this app.) + +## Configuration + +How to configure this app: From an admin panel, a plain file with SSH, or any other way. + +## Documentation + + * Official documentation: Link to the official documentation of this app + * YunoHost documentation: If specific documentation is needed, feel free to contribute. + +## YunoHost specific features + +#### Multi-user support + +Are LDAP and HTTP auth supported? +Can the app be used by multiple users? + +#### Supported architectures + +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/chtickynotes%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/chtickynotes/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/chtickynotes%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/chtickynotes/) + +## Limitations + +* Any known limitations. + +## Additional information + +* Other info you would like to add about this app. + +## Links + + * Report a bug: https://github.com/YunoHost-Apps/chtickynotes_ynh/issues + * YunoHost website: https://yunohost.org/ + +--- + +## Developer info + +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/chtickynotes_ynh/tree/testing). + +To try the testing branch, please proceed like that. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/chtickynotes_ynh/tree/testing --debug +or +sudo yunohost app upgrade chtickynotes -u https://github.com/YunoHost-Apps/chtickynotes_ynh/tree/testing --debug +``` diff --git a/check_process b/check_process new file mode 100644 index 0000000..ab27441 --- /dev/null +++ b/check_process @@ -0,0 +1,33 @@ +# See here for more information +# https://github.com/YunoHost/package_check#syntax-check_process-file + +# Move this file from check_process.default to check_process when you have filled it. + +;; Test complet + ; Manifest + domain="domain.tld" (DOMAIN) + path="/path" (PATH) + is_public=1 (PUBLIC|public=1|private=0) + ; Checks + pkg_linter=1 + setup_sub_dir=1 + setup_root=1 + setup_nourl=0 + setup_private=1 + setup_public=1 + upgrade=1 + backup_restore=1 + multi_instance=0 + # incorrect_path=1 + port_already_use=0 + change_url=1 +;;; Levels + # If the level 5 (Package linter) is forced to 1. Please add justifications here. + Level 5=auto +;;; Options +Email= +Notification=none +;;; Upgrade options + ; commit=CommitHash + name=Name and date of the commit. + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1& diff --git a/conf/nginx.conf b/conf/nginx.conf index 51c7570..99cf262 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,12 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - index index.php; + # Force usage of https + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + + index index.html index.php; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { diff --git a/scripts/backup b/scripts/backup index 0e8f238..48e8fb6 100644 --- a/scripts/backup +++ b/scripts/backup @@ -6,7 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -14,11 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} -# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= @@ -30,7 +24,6 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -49,12 +42,6 @@ ynh_backup --src_path="$final_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - -ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/change_url b/scripts/change_url new file mode 100644 index 0000000..e69de29