Merge pull request #16 from YunoHost-Apps/testing

Testing

.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.*

.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)

README.md

@@ -6,13 +6,13 @@
 *[Lire ce readme en français.](./README_fr.md)*
 
 > *This package allow you to install Backdrop 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
 
 Backdrop CMS is a simple, lightweight, and easy-to-use Content Management System for building professional websites.
 
-**Shipped version:** 1.18.3
+**Shipped version:** 1.19.0
 
 ## Screenshots
 
@@ -47,7 +47,7 @@ Backdrop CMS includes an update utility to handle any necessary changes to the d
 
 ## Links
 
- * Report a bug: https://github.com/YunoHost-Apps/ttrss_ynh/issues
+ * Report a bug: https://github.com/YunoHost-Apps/backdrop_ynh/issues
  * Backdrop website: https://backdropcms.org/
  * Backdrop repository: https://github.com/backdrop/backdrop
  * YunoHost website: https://yunohost.org/

README_fr.md

@@ -6,13 +6,13 @@
 *[Read this readme in english.](./README.md)* 
 
 > *Ce package vous permet d’installer Backdrop rapidement et simplement sur un serveur YunoHost.  
-Si vous n’avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l’installer.*
+Si vous n’avez pas YunoHost, consultez [le guide](https://yunohost.org/install) pour apprendre comment l’installer.*
 
 ## Vue d’ensemble
 
 Backdrop CMS is a simple, lightweight, and easy-to-use Content Management System for building professional websites.
 
-**Version incluse :** 1.18.3
+**Version incluse :** 1.19.0
 
 ## Captures d’écran
 

check_process

@@ -1,8 +1,8 @@
 ;; Nom du test
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
+		domain="domain.tld"
-		path="/path"	    (PATH)
+		path="/path"
-		is_public=1	(PUBLIC|public=1|private=0)
+		is_public=1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -11,6 +11,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		upgrade=1	from_commit=e52fe0eb74d4e8e37bb1c04872ef425cfd914758
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -18,6 +19,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=CommitHash
+	; commit=e52fe0eb74d4e8e37bb1c04872ef425cfd914758
-		name=Name and date of the commit.
+		name=Merge pull request #13 from YunoHost-Apps/1.18.3
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.18.3/backdrop.zip
+SOURCE_URL=https://github.com/backdrop/backdrop/releases/download/1.19.0/backdrop.zip
-SOURCE_SUM=fb82cb6020db15954ed23976c513d3d0f713aa1c77759be065106e4f57b2999b
+SOURCE_SUM=a19ff45d576ad60792b22061b28dfda4a85980aaa7ee5dcd738513894e55192d
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -6,15 +6,23 @@
     "en": "Easy-to-use CMS for building professional websites",
     "fr": "CMS facile à utiliser pour créer des sites Web professionnels"
   },
-  "version": "1.18.3~ynh1",
+  "version": "1.19.0~ynh1",
   "url": "https://backdropcms.org/",
+  "upstream": {
+        "license": "GPL-2.0",
+        "website": "https://backdropcms.org/",
+        "demo": "https://backdropcms.org/demo",
+        "admindoc": "https://yunohost.org/packaging_apps",
+        "userdoc": "https://backdropcms.org/user-guide",
+        "code": "https://github.com/backdrop/backdrop"
+    },
   "license": "GPL-2.0",
   "maintainer": {
     "name": "eric_G",
     "email": ""
   },
   "requirements": {
-    "yunohost": ">= 4.1.7"
+    "yunohost": ">= 4.2.4"
   },
   "multi_instance": true,
   "services": [

pull_request_template.md

@@ -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!"*

scripts/install

@@ -111,9 +111,9 @@ ynh_store_file_checksum --file="$final_path/settings.php"
 #=================================================
 
 # Set permissions to app files
-chown -R root: $final_path
+chmod 750 "$final_path"
-chown -R $app:www-data $final_path/files
+chmod -R o-rwx "$final_path"
-chmod -R 770 $final_path/files
+chown -R $app:www-data "$final_path"
 
 #=================================================
 # SETUP SSOWAT

scripts/restore

@@ -66,9 +66,9 @@ ynh_restore_file --origin_path="$final_path"
 #=================================================
 
 # Set permissions to app files
-chown -R root: $final_path
+chmod 750 "$final_path"
-chown -R $app:www-data $final_path/files
+chmod -R o-rwx "$final_path"
-chmod -R 770 $final_path/files
+chown -R $app:www-data "$final_path"
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION

scripts/upgrade

@@ -85,23 +85,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Reconfiguring Backdrop..." --weight=2
 
-	# Create a temporary directory
-	tmpdir="$(mktemp -d)"
-
-	# Backup the config file in the temp dir
-	cp -a "$final_path/settings.php" "$tmpdir/settings.php"
-
-	# Remove the app directory securely
-	ynh_secure_remove --file="$final_path"
-
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path"
+	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/settings.php"
-
-	#Copy the admin saved settings from tmp directory to final path	
-	cp -a "$tmpdir/settings.php" "$final_path/settings.php"
-
-	# Remove the tmp directory securely
-	ynh_secure_remove --file="$tmpdir"
 fi
 
 #=================================================
@@ -127,9 +112,9 @@ ynh_add_fpm_config --package="$extra_php_dependencies"
 #=================================================
 
 # Set permissions to app files
-chown -R root: $final_path
+chmod 750 "$final_path"
-chown -R $app:www-data $final_path/files
+chmod -R o-rwx "$final_path"
-chmod -R 770 $final_path/files
+chown -R $app:www-data "$final_path"
 
 #=================================================
 # GENERIC FINALIZATION