From eea2e917f5a306b7f22a6c2bcca7033c815d9ec4 Mon Sep 17 00:00:00 2001 From: krateng Date: Tue, 29 Mar 2022 04:33:44 +0200 Subject: [PATCH 1/3] Fixed password setup --- maloja/proccontrol/setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/maloja/proccontrol/setup.py b/maloja/proccontrol/setup.py index 9e212e1..630e9b4 100644 --- a/maloja/proccontrol/setup.py +++ b/maloja/proccontrol/setup.py @@ -63,16 +63,17 @@ def setup(): print("Password has been set.") elif auth.defaultuser.checkpw("admin"): # if the actual pw is admin, it means we've never set this up properly (eg first start after update) - newpw, newpw_repeat = 1, 2 - while newpw != newpw_repeat: + while True: newpw = prompt("Please set a password for web backend access. Leave this empty to generate a random password.",skip=SKIP,secret=True) if newpw is None: newpw = randomstring(32) print("Generated password:",col["yellow"](newpw)) + break else: newpw_repeat = prompt("Please type again to confirm.",skip=SKIP,secret=True) if newpw != newpw_repeat: print("Passwords do not match!") - else: auth.defaultuser.setpw(newpw) + else: break + auth.defaultuser.setpw(newpw) if malojaconfig["SEND_STATS"] is None: answer = ask("I would like to know how many people use Maloja. Would it be okay to send a daily ping to my server (this contains no data that isn't accessible via your web interface already)?",default=True,skip=SKIP) From 634df2ffafdfa00b6caf981108d333e30bf160f8 Mon Sep 17 00:00:00 2001 From: krateng Date: Tue, 29 Mar 2022 04:34:40 +0200 Subject: [PATCH 2/3] Version bump --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0e9a39b..4e09dec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "malojaserver" -version = "2.14.6" +version = "2.14.7" description = "Self-hosted music scrobble database" readme = "./README.md" requires-python = ">=3.6" From 97aed7e73c6a5fd0e1c6856881a6963fa7ea4148 Mon Sep 17 00:00:00 2001 From: krateng Date: Tue, 29 Mar 2022 04:46:06 +0200 Subject: [PATCH 3/3] Fixed inconsistent Dockerhub secrets --- .github/workflows/dockerhub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index e81bc6d..aff96f6 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -43,6 +43,6 @@ jobs: uses: peter-evans/dockerhub-description@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} repository: krateng/maloja short-description: ${{ github.event.repository.description }}