diff --git a/README.md b/README.md index 1598caf..9cc0d9c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Haste for YunoHost [![Integration level](https://dash.yunohost.org/integration/haste.svg)](https://dash.yunohost.org/appci/app/haste) ![](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) -[![Install Haste with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=haste) +[![Install Haste with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 1b03b9b..a2f9108 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Haste pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/haste.svg)](https://dash.yunohost.org/appci/app/haste) ![](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) -[![Installer Haste avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=haste) +[![Installer Haste avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) *[Read this readme in english.](./README.md)* diff --git a/conf/app.src b/conf/app.src index 58197b4..0cee885 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/seejohnrun/haste-server/archive/677a22987adf0a364d8e03243d3ace20e11b4719.tar.gz -SOURCE_SUM=69cbc631151e09792b83e32b9d6fde8a3eabe40bf252a5b9a7065228aae4e167 +SOURCE_URL=https://github.com/seejohnrun/haste-server/archive/5d2965ffc5d9b309ef6d4be9e8c2288c83d72c73.tar.gz +SOURCE_SUM=099bf0cec59614f0f6151f0809c8580b85d5fe701892dda96263b8aee743d5d8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index abd8968..6e14d50 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,11 +5,11 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } - proxy_pass http://127.0.0.1:__PORT__; - proxy_set_header Host $host; + proxy_pass http://127.0.0.1:__PORT__; + proxy_set_header Host $host; proxy_buffering off; - client_max_body_size 50M; + client_max_body_size 50M; # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/manifest.json b/manifest.json index 82603b9..bee1aca 100644 --- a/manifest.json +++ b/manifest.json @@ -6,12 +6,12 @@ "en": "Open-source pastebin allowing to upload texts", "fr": "Pastebin open-source permettant de mettre en ligne du texte" }, - "version": "0.1.0~ynh4", + "version": "0.1.0~ynh5", "url": "https://github.com/seejohnrun/haste-server", "license": "MIT", "maintainer": { - "name": "mbugeia", - "email": "maxime.bugeia@gmail.com" + "name": "eric_G", + "email": "" }, "requirements": { "yunohost": ">= 4.0.0" @@ -29,17 +29,7 @@ "en": "Choose a domain name for Haste", "fr": "Choisissez un nom de domaine pour Haste" }, - "example": "example.com" - }, - { - "name": "path", - "type": "path", - "ask": { - "en": "Choose a path for Haste, only / is allowed.", - "fr": "Choisissez un chemin pour Haste, seul / est autorisé." - }, - "example": "/", - "default": "/" + "example": "paste.example.com" }, { "name": "is_public", diff --git a/pull_request_template.md b/pull_request_template.md index 3cf2e53..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -13,6 +13,4 @@ ## Package_check results --- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/haste_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/haste_ynh%20PR-NUM-%20(USERNAME)/) +* 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/_common.sh b/scripts/_common.sh index ac79128..7912aa4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=12 +nodejs_version=14 #================================================= # PERSONAL HELPERS diff --git a/scripts/change_url b/scripts/change_url index 89ef6c9..aac1a25 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -108,7 +108,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index b1e72a9..08d6cc8 100755 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ ynh_app_setting_set --app=$app --key=path_url --value=$path_url #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Configuring firewall..." --weight=2 +ynh_script_progression --message="Finding an available port..." --weight=2 # Find an available port port=$(ynh_find_port --port=7777) @@ -155,7 +155,7 @@ cp ../conf/haste.sh /usr/bin/$app chown -R root: $final_path chown -R $app: "$final_path/static" -chown -R $app: "$data_path" +chown -R $app: $data_path chmod +x /usr/bin/$app #================================================= @@ -174,7 +174,7 @@ ynh_use_logrotate # INTEGRATE SERVICE IN YUNOHOST #================================================= -yunohost service add $app --description="Haste is an open-source pastebin software" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Haste is a pastebin software" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE @@ -182,16 +182,16 @@ yunohost service add $app --description="Haste is an open-source pastebin softwa ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/restore b/scripts/restore index e385747..556d104 100755 --- a/scripts/restore +++ b/scripts/restore @@ -101,7 +101,7 @@ chown $app -R /var/log/$app # INTEGRATE SERVICE IN YUNOHOST #================================================= -yunohost service add $app --description="Haste is an open-source pastebin software" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Haste is a pastebin software" --log="/var/log/$app/$app.log" #================================================= # RESTORE SYSTEMD @@ -116,7 +116,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" #================================================= # RESTORE THE LOGROTATE CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 4217ab9..aa85cb6 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,21 +172,21 @@ cp ../conf/haste.sh /usr/bin/$app chown -R root: $final_path chown -R $app: "$final_path/static" -chown -R $app: "$data_path" +chown -R $app: $data_path chmod +x /usr/bin/$app #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -yunohost service add $app --description="Haste is an open-source pastebin software" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Haste is a pastebin software" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" #================================================= # RELOAD NGINX