From 11f1dc25d3f7e11b847bd2b42e16cb5a4eca1bfc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Jan 2021 20:08:21 +0100 Subject: [PATCH] Fix --- README.md | 12 +++--------- check_process | 5 ----- issue_template.md | 2 +- manifest.json | 2 +- scripts/_common.sh | 4 ++++ scripts/upgrade | 31 ------------------------------- 6 files changed, 9 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 1597851..72bf502 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ ![Misskey](https://raw.githubusercontent.com/syuilo/misskey/develop/assets/title.png) ================================================================ -# Misskey for Yunohost +# Misskey for YunoHost [![Integration level](https://dash.yunohost.org/integration/misskey.svg)](https://dash.yunohost.org/appci/app/misskey) ![](https://ci-apps.yunohost.org/ci/badges/misskey.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/misskey.maintain.svg) -[![Install misskey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=misskey) - +[![Install misskey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=misskey) > *This package allows you to install Misskey quickly and simply on a YunoHost server. @@ -12,7 +11,6 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ![](https://藍.moe/aiart/31.png) - ## Overview [Misskey](https://join.misskey.page/en/) is a forever evolving, sophisticated microblogging platform that support Fediverse. It provide another flavour to decentralised network. Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? @@ -23,8 +21,6 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ![](https://raw.githubusercontent.com/syuilo/misskey/develop/assets/ss/user.jpg) - - ## Other instances to join * [Instances](https://join.misskey.page/en/wiki/instances/) @@ -66,10 +62,8 @@ $ screen -r --- -Developer info ----------------- +## Developer info -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/misskey_ynh/tree/testing). To try the testing branch, please proceed like that. diff --git a/check_process b/check_process index d8c9d41..a7d6130 100644 --- a/check_process +++ b/check_process @@ -18,13 +18,8 @@ upgrade=0 from_commit=CommitHash backup_restore=0 multi_instance=1 - # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. - # 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=anmol@datamol.org Notification=all diff --git a/issue_template.md b/issue_template.md index 87b88d4..4f952c5 100644 --- a/issue_template.md +++ b/issue_template.md @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install REPLACEBYYOURAPP + sudo yunohost app install misskey ``` - *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:* diff --git a/manifest.json b/manifest.json index b2ae1b0..821d126 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,7 @@ "name": "Anmol" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": ["nginx"], diff --git a/scripts/_common.sh b/scripts/_common.sh index e7669fb..0ad4945 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,10 +3,14 @@ #================================================= # COMMON VARIABLES #================================================= + MEMORY_NEEDED="2560" + # dependencies used by the app pkg_dependencies=" build-essential python ffmpeg redis-server redis-tools postgresql postgresql-contrib" + NODEJS_VERSION="12" + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 87c2f97..6b34a64 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,12 +29,6 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) # CHECK VERSION #================================================= -### This helper will compare the version of the currently installed app and the version of the upstream package. -### $upgrade_type can have 2 different values -### - UPGRADE_APP if the upstream app version has changed -### - UPGRADE_PACKAGE if only the YunoHost package has changed -### ynh_check_app_version_changed will stop the upgrade if the app is up to date. -### UPGRADE_APP should be used to upgrade the core app only if there's an upgrade to do. upgrade_type=$(ynh_check_app_version_changed) #================================================= @@ -77,18 +71,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -# N.B. : this is for app installations before YunoHost 2.7 -# where this value might be something like /foo/ or foo/ -# instead of /foo .... -# If nobody installed your app before 2.7, then you may -# safely remove this line -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -172,7 +154,6 @@ pushd "$final_path" NODE_ENV=production yarn build popd - #================================================= # SETUP SYSTEMD #================================================= @@ -216,18 +197,6 @@ ynh_script_progression --message="Starting a systemd service..." ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="All workers started" -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi - #================================================= # RELOAD NGINX #=================================================