From 3ff75718b6925cc754967f21ed4af1c054512caf Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 26 Mar 2021 22:16:04 +0100
Subject: [PATCH] Upgrade to version 1.8.1

---
 README.md       |  4 ++--
 README_fr.md    |  4 ++--
 conf/app.src    |  4 ++--
 manifest.json   | 16 ++--------------
 scripts/install |  1 +
 scripts/restore |  1 +
 scripts/upgrade |  1 +
 7 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 4e76ea8..3d877df 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # YOURLS for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/yourls.svg)](https://dash.yunohost.org/appci/app/yourls) ![](https://ci-apps.yunohost.org/ci/badges/yourls.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yourls.maintain.svg)  
-[![Install YOURLS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=yourls)
+[![Install YOURLS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yourls)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 YOURLS stands for Your Own URL Shortener. It is a small set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or bitly).
 
-**Shipped version:** 1.7.9
+**Shipped version:** 1.8.1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index b053348..91cc124 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,7 +1,7 @@
 # YOURLS pour YunoHost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/yourls.svg)](https://dash.yunohost.org/appci/app/yourls) ![](https://ci-apps.yunohost.org/ci/badges/yourls.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yourls.maintain.svg)  
-[![Installer YOURLS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=yourls)
+[![Installer YOURLS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yourls)
 
 *[Read this readme in english.](./README.md)* 
 
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 ## Vue d'ensemble
 YOURLS signifie Your Own URL Shortener. C'est un petit ensemble de scripts PHP qui vous permettront d'exécuter votre propre service de raccourcissement d'URL (à la TinyURL ou bitly).
 
-**Version incluse :** 1.7.9
+**Version incluse :** 1.8.1
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index 219dac2..41cb246 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/YOURLS/YOURLS/archive/1.7.9.zip
-SOURCE_SUM=1cc4ecd97e4c143ca85d684d9a5ce0a79c4b359d85b76c7ca58f1babed8a5cfe
+SOURCE_URL=https://github.com/YOURLS/YOURLS/archive/1.8.1.zip
+SOURCE_SUM=c67eb7bf717de677d8a03d8be2cc0a505810252a75bcc00c3d6717c4d0ad7123
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index c5034ff..409a9aa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "URL shortening service",
         "fr": "Service de raccourcisseur d'URL"
     },
-    "version": "1.7.9~ynh2",
+    "version": "1.8.1~ynh1",
     "url": "https://github.com/YOURLS/YOURLS",
     "license": "MIT",
     "maintainer": {
@@ -15,7 +15,7 @@
         "url": ""
     },
     "requirements": {
-        "yunohost": ">= 4.0.0"
+        "yunohost": ">= 4.1.7"
     },
     "previous_maintainers": {
         "name": "courgette",
@@ -33,29 +33,17 @@
             {
                 "name": "domain",
                 "type": "domain",
-                "ask": {
-                    "en": "Choose a domain for YOURLS",
-                    "fr": "Choisissez un domaine pour YOURLS"
-                },
                 "example": "domain.org"
             },
             {
                 "name": "path",
                 "type": "path",
-                "ask": {
-                    "en": "Choose a path for YOURLS",
-                    "fr": "Choisissez un chemin pour YOURLS"
-                },
                 "example": "/yourls",
                 "default": "/yourls"
             },
             {
                 "name": "admin",
                 "type": "user",
-                "ask": {
-                    "en": "Choose an admin user",
-                    "fr": "Choisissez l'administrateur"
-                },
                 "example": "johndoe"
             }
         ]
diff --git a/scripts/install b/scripts/install
index ff1d319..5a3de2d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -115,6 +115,7 @@ ynh_store_file_checksum "$final_path/user/config.php"
 #=================================================
 
 chown -R $app: $final_path
+chmod 600 $final_path/user/config.php
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/restore b/scripts/restore
index 579ef38..0b3848f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -72,6 +72,7 @@ ynh_system_user_create --username=$app
 
 # Restore permissions on app files
 chown -R $app: $final_path
+chmod 600 $final_path/user/config.php
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index b6ef43f..3c98e9b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -143,6 +143,7 @@ ynh_store_file_checksum --file="$final_path/user/config.php"
 
 # Restore permissions on app files
 chown -R $app: $final_path
+chmod 600 $final_path/user/config.php
 
 #=================================================
 # RELOAD NGINX