mirror of
https://github.com/YunoHost-Apps/shaarli_ynh.git
synced 2024-09-03 20:26:10 +02:00
Merge pull request #81 from YunoHost-Apps/testing
Simpler sha1 computation (#80)
This commit is contained in:
commit
445198c4c5
4 changed files with 6 additions and 4 deletions
|
@ -30,7 +30,8 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i
|
|||
- feed other blogs, aggregators, social networks...
|
||||
|
||||
|
||||
**Shipped version:** 0.12.1~ynh4
|
||||
**Shipped version:** 0.12.1~ynh5
|
||||
|
||||
|
||||
**Demo:** https://demo.shaarli.org/
|
||||
|
||||
|
|
|
@ -30,7 +30,8 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i
|
|||
- feed other blogs, aggregators, social networks...
|
||||
|
||||
|
||||
**Version incluse :** 0.12.1~ynh4
|
||||
**Version incluse :** 0.12.1~ynh5
|
||||
|
||||
|
||||
**Démo :** https://demo.shaarli.org/
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
"en": "The personal, minimalist, super-fast, no-database delicious clone",
|
||||
"fr": "Clone de delicious, rapide, simple et sans base de données"
|
||||
},
|
||||
"version": "0.12.1~ynh4",
|
||||
"version": "0.12.1~ynh5",
|
||||
"url": "https://github.com/shaarli/Shaarli",
|
||||
"upstream": {
|
||||
"license": "MIT",
|
||||
|
|
|
@ -110,7 +110,7 @@ timezone=$(cat /etc/timezone)
|
|||
salt=$(php$phpversion -r 'echo sha1(uniqid("", true) ."_". mt_rand());')
|
||||
|
||||
# Generate the hash with the password
|
||||
hash=$(php$phpversion -r "echo sha1('${password}'.'${admin}'.'${salt}');")
|
||||
hash=$(echo -n "${password}${admin}${salt}" | sha1sum | awk '{print $1}')
|
||||
|
||||
# Generate the API secret
|
||||
secret=$(php${YNH_PHP_VERSION} -r "echo str_shuffle(substr(hash_hmac('sha512', uniqid('${salt}'), '${admin}'), 10, 12));")
|
||||
|
|
Loading…
Add table
Reference in a new issue