Merge pull request #67 from YunoHost-Apps/testing

Testing

README.md

@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 URL Shortener
 
-**Shipped version:** 0.23-0~ynh1
+**Shipped version:** 0.25.0~ynh1
 
 **Demo:** https://lstu.fr
 

README_fr.md

@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Raccourcisseur d'URL
 
-**Version incluse :** 0.23-0~ynh1
+**Version incluse :** 0.25.0~ynh1
 
 **Démo :** https://lstu.fr
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://framagit.org/fiat-tux/hat-softwares/lstu/-/archive/0.23-0/lstu-0.23-0.tar.gz
-SOURCE_SUM=77bbe521403da22db2753fbeb4939a2decb220e0a21e88b4754a774a9a217c6d
+SOURCE_URL=https://framagit.org/fiat-tux/hat-softwares/lstu/-/archive/0.25-0/lstu-0.25-0.tar.gz
+SOURCE_SUM=eae4bc13ef761996a13c8133647dce14e040a67173b099b630ef35dba3b19209
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/lstu.conf.template

@@ -31,6 +31,11 @@
     # optional, but you won't have access to admin /stats if not set and if adminpwd is not set either
     hashed_adminpwd => '__HASHED_PASSWORD__',
 
+    # indicates if you want to really delete URLs from admin page (/stats)
+    # or just want to deactivate the shorten URL (won’t redirect anymore, can’t be used anymore)
+    # optional, default to 0 (false)
+    #really_delete_urls => 0,
+
     # choose a theme. See the available themes in `themes` directory
     # optional, default is 'default'
     theme         => '__THEME__', # default or milligram
@@ -66,6 +71,10 @@
     # optional
     #fixed_domain => 'example.org',
 
+    # if set to 1, Lstu will try to prevent its use without using the web interface
+    # optional, default is 0
+    #disable_api => 0,
+
     # choose what database you want to use
     # valid choices are sqlite, postgresql and mysql (all lowercase)
     # optional, default is sqlite
@@ -179,12 +188,12 @@
     # please note that everybody can still use shortend URLs
     # optional, no default
     #ldap => {
-    #   uri         => 'ldap://localhost:389',          # server URI
+    #   uri         => 'ldap://localhost:389',           # server URI
     #    user_tree   => 'dc=yunohost,dc=org',            # search base DN
     #    bind_dn     => 'ou=users,dc=yunohost,dc=org',   # search bind DN
     #    bind_pwd    => '',                              # search bind password
     #    user_attr   => 'uid',                           # user attribute (uid, mail, sAMAccountName, etc.)
-    #    user_filter => '(!(uid=ldap_user))',           # user filter (to exclude some users, etc.)
+    #    user_filter => '(!(uid=ldap_user))',            # user filter (to exclude some users, etc.)
     #},
 
     # set `htpasswd` if you want to use an htpasswd file instead of ldap

conf/nginx.conf

@@ -1,10 +1,6 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-    if ($scheme = http) {
-        rewrite ^ https://$server_name$request_uri? permanent;
-    }
-
     access_log /var/log/nginx/lstu.access.log;
     error_log /var/log/nginx/lstu.error.log;
 

conf/systemd.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Shortened URLs service
+Description=Lstu: Shortened URLs service
 Documentation=https://framagit.org/luc/lstu
 Requires=network.target
 After=network.target

manifest.json

@@ -6,7 +6,7 @@
 		"en": "URL Shortener",
 		"fr": "Raccourcisseur d'URL"
 	},
-	"version": "0.23-0~ynh1",
+	"version": "0.25.0~ynh1",
 	"url": "https://lstu.fr",
 	"upstream": {
         "license": "WTFPL",
@@ -21,7 +21,7 @@
 		"email": "abld@abld.info"
 	},
 	"requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
 	},
 	"multi_instance": true,
 	"services": [
@@ -51,10 +51,7 @@
 					"en": "Choose a theme",
 					"fr": "Choisissez un theme"
 				},
-				"choices": [
-					"default",
-					"milligram"
-				],
+				"choices": ["default", "milligram"],
 				"default": "milligram"
 			},
 			{

scripts/install

@@ -72,7 +72,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE

scripts/restore

@@ -78,7 +78,7 @@ chown -R $app:www-data "$final_path"
 ynh_script_progression --message="Reinstalling dependencies..."
 
 # Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE

scripts/upgrade

@@ -156,7 +156,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..."
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CONFIGURE LSTU