1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/funkwhale_ynh.git synced 2024-09-03 18:36:24 +02:00

Upgrade to 0.13

This commit is contained in:
Jean-Baptiste Holcroft 2018-05-20 18:22:26 +02:00
parent 1fefbc1bbb
commit 785cc05e4d
5 changed files with 19 additions and 46 deletions

View file

@ -10,15 +10,16 @@
admin="john" (USER)
is_public=1 (PUBLIC|public=1|private=0)
; Checks
pkg_linter=1
pkg_linter=0
setup_sub_dir=0
setup_root=1
setup_root=0
setup_nourl=0
setup_private=1
setup_public=1
setup_private=0
setup_public=0
upgrade=1
backup_restore=1
multi_instance=1
upgrade=1 from_commit=9b30b385673eb4dda1c85a84a9cacf8409cf4ab7
backup_restore=0
multi_instance=0
incorrect_path=0
port_already_use=0
change_url=0
@ -35,3 +36,10 @@
Level 8=0
Level 9=0
Level 10=0
;;; Options
Email=jean-baptiste@holcroft.fr
Notification=all
;;; Upgrade options
; commit=9b30b385673eb4dda1c85a84a9cacf8409cf4ab7
name=Upgrade from 0.12
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/builds/artifacts/0.12/download?job=build_front
SOURCE_SUM=9c83b90877c6025654c071a87dd60dd69c5548df0fdfa77abcc27a259c846c64
SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/builds/artifacts/0.13/download?job=build_front
SOURCE_SUM=6b22681951b7e5f2acea84ee8f1767256b723591ddcaf3e526c885ba26335934
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=false

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.12/funkwhale-0.12.tar.bz2
SOURCE_SUM=5ef7a2cdc760f16f9fde818e1a17eff18bc59e47b985f405b85337d38f71ddaf
SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.13/funkwhale-0.13.tar.bz2
SOURCE_SUM=e615fdb072528cac190c6a241ac371dc2f57a5e5ee7ae8788d7b512f39300788
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.bz2
SOURCE_IN_SUBDIR=true

View file

@ -8,7 +8,7 @@
"description": {
"en": "A modern, convivial and free music server"
},
"version": "0.12.0-1",
"version": "0.13.0~ynh1",
"url": "https://funkwhale.audio",
"license": "BSD-3-Clause",
"maintainer": {

View file

@ -1,35 +0,0 @@
diff --git a/api/funkwhale_api/users/models.py b/api/funkwhale_api/users/models.py
index 773d60f38ebec50dd46cda63b05b37ac4659573c..f067a2a8b44b4bfbd61b8f7af86829301d178da0 100644
--- a/api/funkwhale_api/users/models.py
+++ b/api/funkwhale_api/users/models.py
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import
+import binascii
+import os
import uuid
-import secrets
from django.conf import settings
from django.contrib.auth.models import AbstractUser
@@ -14,6 +15,10 @@ from django.utils.translation import ugettext_lazy as _
from funkwhale_api.common import fields
+def get_token():
+ return binascii.b2a_hex(os.urandom(15)).decode('utf-8')
+
+
@python_2_unicode_compatible
class User(AbstractUser):
@@ -58,7 +63,7 @@ class User(AbstractUser):
return self.secret_key
def update_subsonic_api_token(self):
- self.subsonic_api_token = secrets.token_hex(32)
+ self.subsonic_api_token = get_token()
return self.subsonic_api_token
def set_password(self, raw_password):