Adopt Gitpod to architecture changes

.gitpod.yml

@@ -19,6 +19,7 @@ tasks:
       gp ports await 5432
 
       poetry run funkwhale-manage migrate
+      poetry run funkwhale-manage fw users create --superuser --username gitpod --password funkwhale --email test@example.org
       poetry run funkwhale-manage gitpod init
     command: |
       echo "MEDIA_URL=`gp url 8000`/media/" >> ../.gitpod/.env
@@ -62,7 +63,7 @@ tasks:
       echo -e "    \u1b[34m⣀⠀⢀⡀⢀⣀\u1b[0m⠹⠇\u1b[34m⣀⡀⢀⡀⠀⣀    \u1b[0mTo sign in to the superuser account,"
       echo -e "    \u1b[34m⢻⣇⠘⣧⡈⠻⠶⠶⠟⢁⣾⠃⣸⡟    \u1b[0mplease use these credentials:"
       echo -e "    \u1b[34m⠀⠻⣦⡈⠻⠶⣶⣶⠶⠟⢁⣴⠟⠀"
-      echo -e "    \u1b[34m⠀⠀⠈⠻⠷⣦⣤⣤⣴⠾⠟⠁⠀⠀    gitpod\u1b[0m:\u1b[34mgitpod"
+      echo -e "    \u1b[34m⠀⠀⠈⠻⠷⣦⣤⣤⣴⠾⠟⠁⠀⠀    gitpod\u1b[0m:\u1b[34mfunkwhale"
       echo ""
 
 ports:

.gitpod/docker-compose.yml

@@ -18,7 +18,6 @@ services:
       - 6379:6379
 
   nginx:
-    command: /entrypoint.sh
     env_file:
       - ./.env
     image: nginx
@@ -33,11 +32,11 @@ services:
       - "FUNKWHALE_FRONT_IP=host.docker.internal"
       - "FUNKWHALE_FRONT_PORT=8080"
       - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-host.docker.internal}"
+      - "FUNKWHALE_PROTOCOL=https"
     volumes:
       - ../data/media:/protected/media:ro
       - ../data/music:/music:ro
       - ../data/staticfiles:/staticfiles:ro
       - ../deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro
-      - ../docker/nginx/conf.dev:/etc/nginx/nginx.conf.template:ro
+      - ../docker/nginx/conf.dev:/etc/nginx/templates/default.conf.template:ro
-      - ../docker/nginx/entrypoint.sh:/entrypoint.sh:ro
       - ../front:/frontend:ro

api/funkwhale_api/common/management/commands/gitpod.py

@@ -36,22 +36,7 @@ class Command(BaseCommand):
         self.stdout.write("")
 
     def init(self):
-        try:
+        user = User.objects.get(username="gitpod")
-            user = User.objects.get(username="gitpod")
-        except Exception:
-            call_command(
-                "createsuperuser",
-                username="gitpod",
-                email="gitpod@example.com",
-                no_input=False,
-            )
-            user = User.objects.get(username="gitpod")
-
-        user.set_password("gitpod")
-        if not user.actor:
-            user.create_actor()
-
-        user.save()
 
         # Allow anonymous access
         preferences.set("common__api_authentication_required", False)