From 668b994f329f6ffd8b8aa687709ed4b3d30458c5 Mon Sep 17 00:00:00 2001 From: Shin'ya Minazuki Date: Sun, 25 Jan 2026 01:20:05 -0300 Subject: [PATCH] =?UTF-8?q?=E3=82=AE=E3=82=BF=E3=83=BC=E3=82=92=E5=BC=BE?= =?UTF-8?q?=E3=81=8F=20-Playing=20guitar-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Shin'ya Minazuki --- .gitpod.yml | 40 +++++++++++++++++++------------------- .gitpod/docker-compose.yml | 18 ++++++++--------- .gitpod/gitpod.env | 12 ++++++------ README.md | 5 ++--- 4 files changed, 37 insertions(+), 38 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 29f893054..d31fdf1d7 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,8 +4,8 @@ image: tasks: - name: Backend env: - ENV_FILE: /workspace/funkwhale/.gitpod/.env - COMPOSE_FILE: /workspace/funkwhale/.gitpod/docker-compose.yml + ENV_FILE: /workspace/funquail/.gitpod/.env + COMPOSE_FILE: /workspace/funquail/.gitpod/docker-compose.yml before: | cp .gitpod/gitpod.env .gitpod/.env cd api @@ -18,9 +18,9 @@ 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 + poetry run funquail-manage migrate + poetry run funquail-manage fw users create --superuser --username gitpod --password funquail --email test@example.org + poetry run funquail-manage gitpod init command: | echo "MEDIA_URL=`gp url 8000`/media/" >> ../.gitpod/.env echo "STATIC_URL=`gp url 8000`/staticfiles/" >> ../.gitpod/.env @@ -29,16 +29,16 @@ tasks: docker-compose up -d gp ports await 5432 - poetry run funkwhale-manage collectstatic --no-input - poetry run funkwhale-manage gitpod dev + poetry run funquail-manage collectstatic --no-input + poetry run funquail-manage gitpod dev - name: Celery Worker env: - ENV_FILE: /workspace/funkwhale/.gitpod/.env + ENV_FILE: /workspace/funquail/.gitpod/.env before: cd api command: | gp ports await 5000 - poetry run celery -A funkwhale_api.taskapp worker -l debug -B --concurrency=0 + poetry run celery -A funquail_api.taskapp worker -l debug -B --concurrency=0 - name: Frontend env: @@ -53,10 +53,10 @@ tasks: init: make install command: make dev - - name: Welcome to Funkwhale development! + - name: Welcome to FunQuail development! env: - COMPOSE_FILE: /workspace/funkwhale/.gitpod/docker-compose.yml - ENV_FILE: /workspace/funkwhale/.gitpod/.env + COMPOSE_FILE: /workspace/funquail/.gitpod/docker-compose.yml + ENV_FILE: /workspace/funquail/.gitpod/.env VUE_EDITOR: code DJANGO_SETTINGS_MODULE: config.settings.local init: | @@ -64,21 +64,21 @@ tasks: pre-commit run --all command: | echo "" - echo -e " ⠀⠀⠸⣿⣷⣦⣄⣠⣶⣾⣿⠇⠀⠀ You can now start developing Funkwhale with gitpod!" - echo -e " ⠀⠀⠀⠈⠉⠻⣿⣿⠟⠉⠁⠀⠀⠀" - 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[34mfunkwhale" + echo -e " You can now start developing FunQuail with gitpod!" + echo -e " " + echo -e " To sign in to the superuser account," + echo -e " please use these credentials:" + echo -e " " + echo -e " gitpod\u1b[0m:\u1b[34mfunquail" echo "" ports: - - name: Funkwhale + - name: FunQuail port: 8000 visibility: public onOpen: notify - - name: Funkwhale API + - name: FunQuail API port: 5000 visibility: private onOpen: ignore diff --git a/.gitpod/docker-compose.yml b/.gitpod/docker-compose.yml index 62b5f5930..cc2b2359c 100644 --- a/.gitpod/docker-compose.yml +++ b/.gitpod/docker-compose.yml @@ -27,17 +27,17 @@ services: - host.docker.internal:host-gateway environment: - "NGINX_MAX_BODY_SIZE=100M" - - "FUNKWHALE_API_IP=host.docker.internal" - - "FUNKWHALE_API_HOST=host.docker.internal" - - "FUNKWHALE_API_PORT=5000" - - "FUNKWHALE_FRONT_IP=host.docker.internal" - - "FUNKWHALE_FRONT_PORT=8080" - - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-host.docker.internal}" - - "FUNKWHALE_PROTOCOL=https" + - "FUNQUAIL_API_IP=host.docker.internal" + - "FUNQUAIL_API_HOST=host.docker.internal" + - "FUNQUAIL_API_PORT=5000" + - "FUNQUAIL_FRONT_IP=host.docker.internal" + - "FUNQUAIL_FRONT_PORT=8080" + - "FUNQUAIL_HOSTNAME=${FUNKWHALE_HOSTNAME-host.docker.internal}" + - "FUNQUAIL_PROTOCOL=https" volumes: - - ../data/media:/workspace/funkwhale/data/media:ro + - ../data/media:/workspace/funquail/data/media:ro - ../data/music:/music:ro - ../data/staticfiles:/usr/share/nginx/html/staticfiles/:ro - - ../deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro + - ../deploy/funquail_proxy.conf:/etc/nginx/funquail_proxy.conf:ro - ../docker/nginx/conf.dev:/etc/nginx/templates/default.conf.template:ro - ../front:/frontend:ro diff --git a/.gitpod/gitpod.env b/.gitpod/gitpod.env index c30ca9276..a350aa274 100644 --- a/.gitpod/gitpod.env +++ b/.gitpod/gitpod.env @@ -1,15 +1,15 @@ # Dev Environment Variables -DJANGO_ALLOWED_HOSTS=.funkwhale.test,localhost,nginx,0.0.0.0,127.0.0.1,.gitpod.io +DJANGO_ALLOWED_HOSTS=.funquail.test,localhost,nginx,0.0.0.0,127.0.0.1,.gitpod.io DJANGO_SETTINGS_MODULE=config.settings.local C_FORCE_ROOT=true BROWSABLE_API_ENABLED=True FORWARDED_PROTO=http LDAP_ENABLED=False -FUNKWHALE_SPA_HTML_ROOT=http://localhost:8000/ -FUNKWHALE_URL=http://localhost:8000/ -MUSIC_DIRECTORY_PATH=/workspace/funkwhale/data/music -STATIC_ROOT=/workspace/funkwhale/data/staticfiles/ -MEDIA_ROOT=/workspace/funkwhale/data/media/ +FUNQUAIL_SPA_HTML_ROOT=http://localhost:8000/ +FUNQUAIL_URL=http://localhost:8000/ +MUSIC_DIRECTORY_PATH=/workspace/funquail/data/music +STATIC_ROOT=/workspace/funquail/data/staticfiles/ +MEDIA_ROOT=/workspace/funquail/data/media/ PYTHONTRACEMALLOC=0 PYTHONDONTWRITEBYTECODE=true diff --git a/README.md b/README.md index 1af72014e..351a33faf 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ -# FunQuail - ![Akiyama Mio, from K-On!](front/public/android-chrome-192x192.png) -A platform for uploading, sharing, and publishing audio content across the federated[^1] web.\ +# FunQuail +A platform for uploading, sharing, and publishing audio content across the federated web.\ Curate your music library, listen to podcasts, or create your own content and share it with the world. This project began existence as a hard-fork of [Funkwhale](https://funkwhale.audio).