From 6fa1c20588bfc677434ad61e291be42cb2433a9b Mon Sep 17 00:00:00 2001
From: Moutonjr Geoff <moutonjr@jserv.fr>
Date: Thu, 3 Oct 2019 17:25:51 +0200
Subject: [PATCH] Hotfix uncompat YNH3.5

---
 DEV-v1-staging.md |  4 ++--
 README.md         |  7 -------
 scripts/install   | 13 +++++++------
 scripts/remove    |  1 +
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/DEV-v1-staging.md b/DEV-v1-staging.md
index 5563854..e42772d 100644
--- a/DEV-v1-staging.md
+++ b/DEV-v1-staging.md
@@ -12,8 +12,8 @@ Package will be in v1 and in "working" conditions in Yunohost-Apps when:
 - [ ] Measure timing of installer to bring proper weight
 
 And some breadcrumbs:
-- [ ] change way to install ruby with crappy `rbenv`
-- [ ] Remove: if the PostgreSQL is empty, remove it
+- [x] change way to install ruby with crappy `rbenv`
+- [x] Remove: if the PostgreSQL is empty, remove it ==> NOT APPLICABLE ANYMORE
 - [ ] fully remove `/var/$app` (ynh helper crappy?)
 
 Goal of full-quality :)
diff --git a/README.md b/README.md
index 88dbada..de98686 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,6 @@
 *This package allow you to install Openproject 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.*
 
-** Warning: Still Building! **
-- [ ] Remove all the TODOs
-- [ ] Perform first install with Vagrant
-- [ ] Perform Full install
-- [ ] Perform the Package checker
-- [ ] Notify YNH Team about publication & testing.
-
 ## Overview
 OpenProject is a web-based project management software. Its key features are:
 
diff --git a/scripts/install b/scripts/install
index ee1b788..be01364 100755
--- a/scripts/install
+++ b/scripts/install
@@ -81,7 +81,8 @@ ynh_system_user_create --username="$app" --home_dir="$_homedir" -s
 ynh_script_progression --message="Installing OpenProject & its dependencies..." --weight=1
 
 # Add Openproject Key & repo
-wget -qO- https://dl.packager.io/srv/opf/openproject/key | sudo apt-key add - >/dev/null
+# Var APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE to disable the STDOUT redirection warning
+wget -qO- https://dl.packager.io/srv/opf/openproject/key | sudo APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - >/dev/null
 wget -qO /etc/apt/sources.list.d/openproject.list  https://dl.packager.io/srv/opf/openproject/stable/10/installer/debian/9.repo
 
 ynh_install_app_dependencies "$pkg_dependencies"
@@ -179,11 +180,11 @@ 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"
 systemctl restart openproject.service
 
-# SETUP FAIL2BAN
-ynh_script_progression --message="Configuring fail2ban..." --weight=1
-
-# Create a dedicated fail2ban config
-ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login"
+## SETUP FAIL2BAN
+#ynh_script_progression --message="Configuring fail2ban..." --weight=1
+#
+## Create a dedicated fail2ban config
+#ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/remove b/scripts/remove
index 97cf300..a5bf77e 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -67,6 +67,7 @@ ynh_script_progression --message="Removing app main directory..."  --weight=1
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
 ynh_secure_remove --file="$_homedir"
+ynh_secure_remove --file="/etc/$app/"
 
 #=================================================
 # REMOVE NGINX CONFIGURATION