From 82b0f2f8a4bebe3f0b72aed3522e4bd5a5c2e371 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 16 Jun 2022 01:35:41 +0200 Subject: [PATCH] Upgrade to 0.26.0~ynh1 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 6 ++++-- conf/lstu.conf.ldap | 19 ++++++++++++++++--- conf/lstu.conf.template | 10 +++++++--- conf/nginx.conf | 24 ++++++++++++------------ manifest.json | 2 +- 7 files changed, 42 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index a947789..ffb7f68 100644 --- a/README.md +++ b/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.25.0~ynh1 +**Shipped version:** 0.26.0~ynh1 **Demo:** https://lstu.fr diff --git a/README_fr.md b/README_fr.md index 9b38095..945a5fd 100644 --- a/README_fr.md +++ b/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.25.0~ynh1 +**Version incluse :** 0.26.0~ynh1 **Démo :** https://lstu.fr diff --git a/conf/app.src b/conf/app.src index c943df8..67c9576 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,7 @@ -SOURCE_URL=https://framagit.org/fiat-tux/hat-softwares/lstu/-/archive/0.25-0/lstu-0.25-0.tar.gz -SOURCE_SUM=eae4bc13ef761996a13c8133647dce14e040a67173b099b630ef35dba3b19209 +SOURCE_URL=https://framagit.org/fiat-tux/hat-softwares/lstu/-/archive/0.26-0/lstu-0.26-0.tar.gz +SOURCE_SUM=323c81b4cb04a97eda7cb37b2a63d16e808591fd46eb4326f6619200ce742960 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/conf/lstu.conf.ldap b/conf/lstu.conf.ldap index 2aac266..7101f59 100644 --- a/conf/lstu.conf.ldap +++ b/conf/lstu.conf.ldap @@ -14,11 +14,11 @@ # put a way to contact you here and uncomment it # MANDATORY - contact => 'webmaster@__DOMAIN__', + contact => 'webmaster@__DOMAIN__', # array of random strings used to encrypt cookies # optional, default is ['fdjsofjoihrei'], PLEASE, CHANGE IT - secrets => ['__SECRET__'], + secrets => ['__SECRET__'], # secret passphrase to access some admin features # If you don't want to have a plain text password in configuration, @@ -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 @@ -264,5 +273,9 @@ # Set to 1 if you want to register the IP addresses of URL creators # optional, default is 0 #log_creator_ip => 0, -}; + # Positive integer which specifies how many pixels one "module" (one block of the QR code) occupies. + # You can't use fractional values. An arbitrary upper limit of 100 is imposed by Image::PNG::QRCode module. + # optional, default is 3 + #qrcode_size => 3, +}; diff --git a/conf/lstu.conf.template b/conf/lstu.conf.template index 0ba8420..c026a72 100644 --- a/conf/lstu.conf.template +++ b/conf/lstu.conf.template @@ -14,11 +14,11 @@ # put a way to contact you here and uncomment it # MANDATORY - contact => 'webmaster@__DOMAIN__', + contact => 'webmaster@__DOMAIN__', # array of random strings used to encrypt cookies # optional, default is ['fdjsofjoihrei'], PLEASE, CHANGE IT - secrets => ['__SECRET__'], + secrets => ['__SECRET__'], # secret passphrase to access some admin features # If you don't want to have a plain text password in configuration, @@ -273,5 +273,9 @@ # Set to 1 if you want to register the IP addresses of URL creators # optional, default is 0 #log_creator_ip => 0, -}; + # Positive integer which specifies how many pixels one "module" (one block of the QR code) occupies. + # You can't use fractional values. An arbitrary upper limit of 100 is imposed by Image::PNG::QRCode module. + # optional, default is 3 + #qrcode_size => 3, +}; diff --git a/conf/nginx.conf b/conf/nginx.conf index 85b19c1..4939bf4 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,20 +1,20 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - access_log /var/log/nginx/lstu.access.log; - error_log /var/log/nginx/lstu.error.log; + access_log /var/log/nginx/lstu.access.log; + error_log /var/log/nginx/lstu.error.log; - proxy_pass http://127.0.0.1:__PORT__; + proxy_pass http://127.0.0.1:__PORT__; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Remote-Port $remote_port; - proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Remote-Port $remote_port; + proxy_set_header X-Forwarded-Proto $scheme; - # We expect the downsteam servers to redirect to the right hostname, so don't do any rewrite$ - proxy_redirect off; + # We expect the downsteam servers to redirect to the right hostname, so don't do any rewrite$ + proxy_redirect off; - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } diff --git a/manifest.json b/manifest.json index 85ee083..a37b077 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "URL Shortener", "fr": "Raccourcisseur d'URL" }, - "version": "0.25.0~ynh1", + "version": "0.26.0~ynh1", "url": "https://lstu.fr", "upstream": { "license": "WTFPL",