Renames fr_celery dir to celerywyrm

This commit is contained in:
Mouse Reeve 2020-09-17 14:13:44 -07:00
parent f77c156733
commit d1f1260640
8 changed files with 23 additions and 23 deletions

View file

@ -6,5 +6,5 @@ RUN mkdir /app/images
WORKDIR /app WORKDIR /app
COPY requirements.txt /app/ COPY requirements.txt /app/
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
COPY ./fedireads /app COPY ./bookwyrm /app
COPY ./fr_celery /app COPY ./celerywyrm /app

View file

@ -1,5 +1,5 @@
""" """
ASGI config for fr_celery project. ASGI config for celerywyrm project.
It exposes the ASGI callable as a module-level variable named ``application``. It exposes the ASGI callable as a module-level variable named ``application``.
@ -11,6 +11,6 @@ import os
from django.core.asgi import get_asgi_application from django.core.asgi import get_asgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'fr_celery.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'celerywyrm.settings')
application = get_asgi_application() application = get_asgi_application()

View file

@ -6,9 +6,9 @@ import os
from celery import Celery from celery import Celery
# set the default Django settings module for the 'celery' program. # set the default Django settings module for the 'celery' program.
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'fr_celery.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'celerywyrm.settings')
app = Celery('fr_celery') app = Celery('celerywyrm')
# Using a string here means the worker doesn't have to serialize # Using a string here means the worker doesn't have to serialize
# the configuration object to child processes. # the configuration object to child processes.
@ -18,8 +18,8 @@ app.config_from_object('django.conf:settings', namespace='CELERY')
# Load task modules from all registered Django app configs. # Load task modules from all registered Django app configs.
app.autodiscover_tasks() app.autodiscover_tasks()
app.autodiscover_tasks(['fedireads'], related_name='incoming') app.autodiscover_tasks(['bookwyrm'], related_name='incoming')
app.autodiscover_tasks(['fedireads'], related_name='broadcast') app.autodiscover_tasks(['bookwyrm'], related_name='broadcast')
app.autodiscover_tasks(['fedireads'], related_name='books_manager') app.autodiscover_tasks(['bookwyrm'], related_name='books_manager')
app.autodiscover_tasks(['fedireads'], related_name='goodreads_import') app.autodiscover_tasks(['bookwyrm'], related_name='goodreads_import')

View file

@ -1,5 +1,5 @@
""" """
Django settings for fr_celery project. Django settings for celerywyrm project.
Generated by 'django-admin startproject' using Django 3.0.3. Generated by 'django-admin startproject' using Django 3.0.3.
@ -46,8 +46,8 @@ INSTALLED_APPS = [
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'fr_celery', 'celerywyrm',
'fedireads', 'bookwyrm',
'celery', 'celery',
] ]
@ -61,7 +61,7 @@ MIDDLEWARE = [
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
] ]
ROOT_URLCONF = 'fr_celery.urls' ROOT_URLCONF = 'celerywyrm.urls'
TEMPLATES = [ TEMPLATES = [
{ {
@ -79,7 +79,7 @@ TEMPLATES = [
}, },
] ]
WSGI_APPLICATION = 'fr_celery.wsgi.application' WSGI_APPLICATION = 'celerywyrm.wsgi.application'
# Database # Database
@ -90,15 +90,15 @@ FEDIREADS_DATABASE_BACKEND = env('FEDIREADS_DATABASE_BACKEND', 'postgres')
FEDIREADS_DBS = { FEDIREADS_DBS = {
'postgres': { 'postgres': {
'ENGINE': 'django.db.backends.postgresql_psycopg2', 'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': env('POSTGRES_DB', 'fedireads'), 'NAME': env('POSTGRES_DB', 'bookwyrm'),
'USER': env('POSTGRES_USER', 'fedireads'), 'USER': env('POSTGRES_USER', 'bookwyrm'),
'PASSWORD': env('POSTGRES_PASSWORD', 'fedireads'), 'PASSWORD': env('POSTGRES_PASSWORD', 'bookwyrm'),
'HOST': env('POSTGRES_HOST', ''), 'HOST': env('POSTGRES_HOST', ''),
'PORT': 5432 'PORT': 5432
}, },
'sqlite': { 'sqlite': {
'ENGINE': 'django.db.backends.sqlite3', 'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'fedireads.db') 'NAME': os.path.join(BASE_DIR, 'bookwyrm.db')
} }
} }

View file

@ -1,4 +1,4 @@
"""fr_celery URL Configuration """celerywyrm URL Configuration
The `urlpatterns` list routes URLs to views. For more information please see: The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/3.0/topics/http/urls/ https://docs.djangoproject.com/en/3.0/topics/http/urls/

View file

@ -1,5 +1,5 @@
""" """
WSGI config for fr_celery project. WSGI config for celerywyrm project.
It exposes the WSGI callable as a module-level variable named ``application``. It exposes the WSGI callable as a module-level variable named ``application``.
@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'fr_celery.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'celerywyrm.settings')
application = get_wsgi_application() application = get_wsgi_application()

View file

@ -46,7 +46,7 @@ services:
build: . build: .
networks: networks:
- main - main
command: celery -A fr_celery worker -l info command: celery -A celerywyrm worker -l info
volumes: volumes:
- .:/app - .:/app
depends_on: depends_on: