Merge pull request #58 from YunoHost-Apps/enh-testing

Enh testing

README.md

@@ -3,7 +3,7 @@
 [![Integration level](https://dash.yunohost.org/integration/distbin.svg)](https://dash.yunohost.org/appci/app/distbin) ![](https://ci-apps.yunohost.org/ci/badges/distbin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/distbin.maintain.svg)  
 [![Install distbin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=distbin)
 
-> *This package allows you to install distbin quickly and simply on a YunoHost server.  
+> *This package allows you to install Distbin 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

issue_template.md

@@ -7,8 +7,8 @@ about: Create a report to help us debug, it would be nice to fill the template a
 **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!*
+   - *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 distbin itself. Refer to its documentation or repository for help.*
+   - *Otherwise, the issue may be due to Distbin itself. Refer to its documentation or repository for help.*
    - *If you have a doubt, post here, we will figure it out together.*
 3. *Delete the italic comments as you write over them below, and remove this guide.*
 --- 
@@ -34,8 +34,8 @@ about: Create a report to help us debug, it would be nice to fill the template a
 - *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 '....'*
+   2. *Click on '...'*
-   3. *Scroll down to '....'*
+   3. *Scroll down to '...'*
    4. *See error*
 
 **Expected behavior**

manifest.json

@@ -6,7 +6,7 @@
         "en": "Distributed pastebin with ActivityPub.",
         "fr": "Pastebin distribué utilisant le protocole ActivityPub."
     },
-    "version": "1.3.0~ynh5",
+    "version": "1.3.0~ynh6",
     "url": "https://distbin.com/",
     "license": "Apache-2.0",
     "maintainer": {
@@ -25,8 +25,8 @@
                 "name": "domain",
                 "type": "domain",
                 "ask": {
-                    "en": "Choose a domain name for distbin",
+                    "en": "Choose a domain name for Distbin",
-                    "fr": "Choisissez un nom de domaine pour distbin"
+                    "fr": "Choisissez un nom de domaine pour Distbin"
                 },
                 "example": "distbin.example.com"
             },
@@ -34,8 +34,8 @@
                 "name": "path",
                 "type": "path",
                 "ask": {
-                    "en": "Choose a path for distbin",
+                    "en": "Choose a path for Distbin",
-                    "fr": "Choisissez un chemin pour distbin"
+                    "fr": "Choisissez un chemin pour Distbin"
                 },
                 "example": "/distbin",
                 "default": "/distbin"

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*
+* 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!"*
-
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/distbin_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/distbin_ynh%20PR-NUM-%20(USERNAME)/)  

scripts/install

@@ -169,7 +169,7 @@ ynh_use_logrotate
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $app --description="$app daemon for distbin" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Distributed pastebin" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -190,8 +190,9 @@ ynh_script_progression --message="Configuring SSOwat..."
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-	# unprotected_uris allows SSO credentials to be passed anyway.
+	# Everyone can access the app.
-	ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
+	# The "main" permission is automatically created before the install script.
+	ynh_permission_update --permission="main" --add="visitors"
 fi
 
 #=================================================

scripts/restore

@@ -71,7 +71,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 ynh_script_progression --message="Restoring user rights..."
 
 # Restore permissions on app files
-chown -R "$app":"$app" "$final_path"
+chown -R $app:$app "$final_path"
 
 #=================================================
 # CREATE LOG FOLDER
@@ -79,7 +79,7 @@ chown -R "$app":"$app" "$final_path"
 ynh_script_progression --message="Creating log folder..."
 
 mkdir -p "/var/log/$app"
-chown -R "$app":"$app" "/var/log/$app"
+chown -R $app:$app "/var/log/$app"
 
 #=================================================
 # SPECIFIC RESTORATION
@@ -105,7 +105,7 @@ systemctl enable $app.service --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $app --description="$app daemon for distbin" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Distributed pastebin" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE

scripts/upgrade

@@ -119,7 +119,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 ynh_script_progression --message="Creating log folder..."
 
 mkdir -p "/var/log/$app"
-chown -R "$app":"$app" "/var/log/$app"
+chown -R $app:$app "/var/log/$app"
 
 #=================================================
 # CREATE STORAGE FOLDER
@@ -188,7 +188,7 @@ ynh_use_logrotate --non-append
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $app --description="$app daemon for distbin" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Distributed pastebin" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -200,18 +200,6 @@ if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	sleep 60
 fi
 
-#=================================================
-# 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
 #=================================================