From f6e1070371c0082ae9f77c6328ff66a3e8077c5c Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Mon, 28 May 2018 10:54:43 +0200
Subject: [PATCH 1/2] Create pull_request_template.md

Duplicated from https://github.com/YunoHost-Apps/searx_ynh/pull/35, merged as a micro decision
---
 pull_request_template.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 pull_request_template.md

diff --git a/pull_request_template.md b/pull_request_template.md
new file mode 100644
index 0000000..c7d8ea0
--- /dev/null
+++ b/pull_request_template.md
@@ -0,0 +1,25 @@
+## Problem
+- *Description of why you made this PR*
+
+## Solution
+- *And how you fix that*
+
+## PR Status
+- [ ] Code finished.
+- [ ] Tested with Package_check.
+- [ ] Fix or enhancement tested.
+- [ ] Upgrade from last version tested.
+- [ ] Can be reviewed and tested.
+
+## Validation
+---
+*Minor decision*
+- **Upgrade previous version** : 
+- [ ] **Code review** : 
+- [ ] **Approval (LGTM)** : 
+- [ ] **Approval (LGTM)** : 
+- **CI succeeded** : 
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/shellinabox_ynh%20-BRANCH-%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/shellinabox_ynh%20-BRANCH-%20(Official)/) *Please replace '-BRANCH-' in this link for a PR from a local branch.*  
+or  
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/shellinabox_ynh%20PR-NUM-%20(Official_fork)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/shellinabox_ynh%20PR-NUM-%20(Official_fork)/) *Replace '-NUM-' by the PR number in this link for a PR from a forked repository.*  
+When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.

From 0381aafcb6a1705582b2c5fa6704cec6d34bf26b Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Sat, 23 Jun 2018 15:23:51 +0200
Subject: [PATCH 2/2] Fix --disable-ssl missing after upgrade

---
 scripts/upgrade | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 1b3aae2..96a744f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -59,12 +59,25 @@ ynh_add_nginx_config
 #=================================================
 
 systemctl reload nginx
-
 #=================================================
-# ALLOW THE SERVICE TO LOG IN SYSLOG
+# CONFIGURE SHELLINABOX
 #=================================================
 
+# Verify the checksum and backup the file if it's different
+ynh_backup_if_checksum_is_different "/etc/default/shellinabox"
+
+cp ../conf/shellinabox /etc/default/shellinabox
+ynh_replace_string "__PORT__" "$port" "/etc/default/shellinabox"
+
+# Allow the service to log in syslog
 ynh_replace_string " -- -q --background" " -- --background" "/etc/init.d/shellinabox"
 systemctl daemon-reload
 
 systemctl restart shellinabox
+
+#=================================================
+# STORE THE CHECKSUM OF THE CONFIG FILE
+#=================================================
+
+# Calculate and store the config file checksum into the app settings
+ynh_store_file_checksum "/etc/default/shellinabox"