Skip to content

Commit

Permalink
🚚(backend) rename Impress to Meet
Browse files Browse the repository at this point in the history
I have updated all references of "Impress" to "Meet".
Migrations were manually updated and not regenerated. Never-mind,
they all will be squashed before the first release.

I have also searched for reference to "Magnify", and replaced them
by "Meet".
  • Loading branch information
antoine lebaud committed Jul 1, 2024
1 parent c443b8d commit efc5a1e
Show file tree
Hide file tree
Showing 37 changed files with 103 additions and 103 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.PRIVATE_KEY }}
owner: ${{ github.repository_owner }}
repositories: "impress,secrets"
repositories: "meet,secrets"
-
name: Checkout repository
uses: actions/checkout@v2
Expand All @@ -29,7 +29,7 @@ jobs:
name: Load sops secrets
uses: rouja/actions-sops@main
with:
secret-file: secrets/numerique-gouv/impress/secrets.enc.env
secret-file: secrets/numerique-gouv/meet/secrets.enc.env
age-key: ${{ secrets.SOPS_PRIVATE }}
-
name: Call argocd github webhook
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/impress.yml → .github/workflows/meet.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: impress Workflow
name: meet Workflow

on:
push:
Expand All @@ -21,7 +21,7 @@ jobs:
run: git log
- name: Enforce absence of print statements in code
run: |
! git diff origin/${{ github.event.pull_request.base.ref }}..HEAD -- . ':(exclude)**/impress.yml' | grep "print("
! git diff origin/${{ github.event.pull_request.base.ref }}..HEAD -- . ':(exclude)**/meet.yml' | grep "print("
- name: Check absence of fixup commits
run: |
! git log | grep 'fixup!'
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
postgres:
image: postgres:16
env:
POSTGRES_DB: impress
POSTGRES_DB: meet
POSTGRES_USER: dinum
POSTGRES_PASSWORD: pass
ports:
Expand Down
26 changes: 13 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Django impress
# Django Meet

# ---- base image to inherit from ----
FROM python:3.10-slim-bullseye as base
Expand Down Expand Up @@ -36,7 +36,7 @@ RUN yarn install --frozen-lockfile && \

# ---- static link collector ----
FROM base as link-collector
ARG IMPRESS_STATIC_ROOT=/data/static
ARG MEET_STATIC_ROOT=/data/static

# Install libpangocairo & rdfind
RUN apt-get update && \
Expand All @@ -48,7 +48,7 @@ RUN apt-get update && \
# Copy installed python dependencies
COPY --from=back-builder /install /usr/local

# Copy impress application (see .dockerignore)
# Copy Meet application (see .dockerignore)
COPY ./src/backend /app/

WORKDIR /app
Expand All @@ -59,7 +59,7 @@ RUN DJANGO_CONFIGURATION=Build DJANGO_JWT_PRIVATE_SIGNING_KEY=Dummy \

# Replace duplicated file by a symlink to decrease the overall size of the
# final image
RUN rdfind -makesymlinks true -followsymlinks true -makeresultsfile false ${IMPRESS_STATIC_ROOT}
RUN rdfind -makesymlinks true -followsymlinks true -makeresultsfile false ${MEET_STATIC_ROOT}

# ---- Core application image ----
FROM base as core
Expand Down Expand Up @@ -89,7 +89,7 @@ RUN chmod g=u /etc/passwd
# Copy installed python dependencies
COPY --from=back-builder /install /usr/local

# Copy impress application (see .dockerignore)
# Copy Meet application (see .dockerignore)
COPY ./src/backend /app/

WORKDIR /app
Expand All @@ -110,9 +110,9 @@ RUN apt-get update && \
apt-get install -y postgresql-client && \
rm -rf /var/lib/apt/lists/*

# Uninstall impress and re-install it in editable mode along with development
# Uninstall Meet and re-install it in editable mode along with development
# dependencies
RUN pip uninstall -y impress
RUN pip uninstall -y meet
RUN pip install -e .[dev]

# Restore the un-privileged user running the application
Expand All @@ -130,21 +130,21 @@ CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
# ---- Production image ----
FROM core as backend-production

ARG IMPRESS_STATIC_ROOT=/data/static
ARG MEET_STATIC_ROOT=/data/static

# Gunicorn
RUN mkdir -p /usr/local/etc/gunicorn
COPY docker/files/usr/local/etc/gunicorn/impress.py /usr/local/etc/gunicorn/impress.py
COPY docker/files/usr/local/etc/gunicorn/meet.py /usr/local/etc/gunicorn/meet.py

# Un-privileged user running the application
ARG DOCKER_USER
USER ${DOCKER_USER}

# Copy statics
COPY --from=link-collector ${IMPRESS_STATIC_ROOT} ${IMPRESS_STATIC_ROOT}
COPY --from=link-collector ${MEET_STATIC_ROOT} ${MEET_STATIC_ROOT}

# Copy impress mails
# Copy Meet mails
COPY --from=mail-builder /mail/backend/core/templates/mail /app/core/templates/mail

# The default command runs gunicorn WSGI server in impress's main module
CMD ["gunicorn", "-c", "/usr/local/etc/gunicorn/impress.py", "impress.wsgi:application"]
# The default command runs gunicorn WSGI server in Meet's main module
CMD ["gunicorn", "-c", "/usr/local/etc/gunicorn/meet.py", "meet.wsgi:application"]
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,14 @@ test-back-parallel: ## run all back-end tests in parallel
bin/pytest -n auto $${args:-${1}}
.PHONY: test-back-parallel

makemigrations: ## run django makemigrations for the impress project.
makemigrations: ## run django makemigrations for the Meet project.
@echo "$(BOLD)Running makemigrations$(RESET)"
@$(COMPOSE) up -d postgresql
@$(WAIT_DB)
@$(MANAGE) makemigrations
.PHONY: makemigrations

migrate: ## run django migrations for the impress project.
migrate: ## run django migrations for the Meet project.
@echo "$(BOLD)Running migrations$(RESET)"
@$(COMPOSE) up -d postgresql
@$(WAIT_DB)
Expand Down Expand Up @@ -290,7 +290,7 @@ clean: ## restore repository state as it was freshly cloned
.PHONY: clean

help:
@echo "$(BOLD)impress Makefile"
@echo "$(BOLD)Meet Makefile"
@echo "Please use 'make $(BOLD)target$(RESET)' where $(BOLD)target$(RESET) is one of:"
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(firstword $(MAKEFILE_LIST)) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "$(GREEN)%-30s$(RESET) %s\n", $$1, $$2}'
.PHONY: help
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
args:
DOCKER_USER: ${DOCKER_USER:-1000}
user: ${DOCKER_USER:-1000}
image: impress:backend-development
image: meet:backend-development
environment:
- PYLINTHOME=/app/.pylint.d
- DJANGO_CONFIGURATION=Development
Expand All @@ -44,8 +44,8 @@ services:

celery-dev:
user: ${DOCKER_USER:-1000}
image: impress:backend-development
command: ["celery", "-A", "impress.celery_app", "worker", "-l", "DEBUG"]
image: meet:backend-development
command: ["celery", "-A", "meet.celery_app", "worker", "-l", "DEBUG"]
environment:
- DJANGO_CONFIGURATION=Development
env_file:
Expand All @@ -64,7 +64,7 @@ services:
args:
DOCKER_USER: ${DOCKER_USER:-1000}
user: ${DOCKER_USER:-1000}
image: impress:backend-production
image: meet:backend-production
environment:
- DJANGO_CONFIGURATION=Demo
env_file:
Expand All @@ -77,8 +77,8 @@ services:

celery:
user: ${DOCKER_USER:-1000}
image: impress:backend-production
command: ["celery", "-A", "impress.celery_app", "worker", "-l", "INFO"]
image: meet:backend-production
command: ["celery", "-A", "meet.celery_app", "worker", "-l", "INFO"]
environment:
- DJANGO_CONFIGURATION=Demo
env_file:
Expand Down
8 changes: 4 additions & 4 deletions env.d/development/common.dist
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Django
DJANGO_ALLOWED_HOSTS=*
DJANGO_SECRET_KEY=ThisIsAnExampleKeyForDevPurposeOnly
DJANGO_SETTINGS_MODULE=impress.settings
DJANGO_SETTINGS_MODULE=meet.settings
DJANGO_SUPERUSER_PASSWORD=admin

# Python
PYTHONPATH=/app

# impress settings
# Meet settings

# Mail
DJANGO_EMAIL_HOST="mailcatcher"
DJANGO_EMAIL_PORT=1025

# Backend url
IMPRESS_BASE_URL="http://localhost:8072"
MEET_BASE_URL="http://localhost:8072"

# Media
STORAGES_STATICFILES_BACKEND=django.contrib.staticfiles.storage.StaticFilesStorage
AWS_S3_ENDPOINT_URL=http://minio:9000
AWS_S3_ACCESS_KEY_ID=impress
AWS_S3_ACCESS_KEY_ID=meet
AWS_S3_SECRET_ACCESS_KEY=password

# OIDC
Expand Down
4 changes: 2 additions & 2 deletions env.d/development/postgresql.dist
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Postgresql db container configuration
POSTGRES_DB=impress
POSTGRES_DB=meet
POSTGRES_USER=dinum
POSTGRES_PASSWORD=pass

# App database configuration
DB_HOST=postgresql
DB_NAME=impress
DB_NAME=meet
DB_USER=dinum
DB_PASSWORD=pass
DB_PORT=5432
2 changes: 1 addition & 1 deletion src/backend/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include LICENSE
include README.md
recursive-include src/backend/impress *.html *.png *.gif *.css *.ico *.jpg *.jpeg *.po *.mo *.eot *.svg *.ttf *.woff *.woff2
recursive-include src/backend/meet *.html *.png *.gif *.css *.ico *.jpg *.jpeg *.po *.mo *.eot *.svg *.ttf *.woff *.woff2
2 changes: 1 addition & 1 deletion src/backend/core/api/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Impress core API endpoints"""
"""Meet core API endpoints"""
from django.conf import settings
from django.core.exceptions import ValidationError

Expand Down
2 changes: 1 addition & 1 deletion src/backend/core/api/permissions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Permission handlers for the impress core app."""
"""Permission handlers for the Meet core app."""
from rest_framework import permissions

from ..models import RoleChoices
Expand Down
2 changes: 1 addition & 1 deletion src/backend/core/api/serializers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Client serializers for the impress core app."""
"""Client serializers for the Meet core app."""
from django.utils.translation import gettext_lazy as _

from rest_framework import serializers
Expand Down
6 changes: 3 additions & 3 deletions src/backend/core/apps.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"""Impress Core application"""
"""Meet Core application"""
# from django.apps import AppConfig
# from django.utils.translation import gettext_lazy as _


# class CoreConfig(AppConfig):
# """Configuration class for the impress core app."""
# """Configuration class for the Meet core app."""

# name = "core"
# app_label = "core"
# verbose_name = _("impress core application")
# verbose_name = _("meet core application")
2 changes: 1 addition & 1 deletion src/backend/core/authentication/backends.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Authentication Backends for the Impress core app."""
"""Authentication Backends for the Meet core app."""

from django.core.exceptions import SuspiciousOperation
from django.utils.translation import gettext_lazy as _
Expand Down
12 changes: 6 additions & 6 deletions src/backend/core/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Migration(migrations.Migration):
options={
'verbose_name': 'Document',
'verbose_name_plural': 'Documents',
'db_table': 'impress_document',
'db_table': 'meet_document',
'ordering': ('title',),
},
),
Expand All @@ -49,7 +49,7 @@ class Migration(migrations.Migration):
options={
'verbose_name': 'Template',
'verbose_name_plural': 'Templates',
'db_table': 'impress_template',
'db_table': 'meet_template',
'ordering': ('title',),
},
),
Expand All @@ -76,7 +76,7 @@ class Migration(migrations.Migration):
options={
'verbose_name': 'user',
'verbose_name_plural': 'users',
'db_table': 'impress_user',
'db_table': 'meet_user',
},
managers=[
('objects', django.contrib.auth.models.UserManager()),
Expand All @@ -96,7 +96,7 @@ class Migration(migrations.Migration):
options={
'verbose_name': 'Document/user relation',
'verbose_name_plural': 'Document/user relations',
'db_table': 'impress_document_access',
'db_table': 'meet_document_access',
'ordering': ('-created_at',),
},
),
Expand All @@ -114,7 +114,7 @@ class Migration(migrations.Migration):
options={
'verbose_name': 'Document invitation',
'verbose_name_plural': 'Document invitations',
'db_table': 'impress_invitation',
'db_table': 'meet_invitation',
},
),
migrations.CreateModel(
Expand All @@ -131,7 +131,7 @@ class Migration(migrations.Migration):
options={
'verbose_name': 'Template/user relation',
'verbose_name_plural': 'Template/user relations',
'db_table': 'impress_template_access',
'db_table': 'meet_template_access',
'ordering': ('-created_at',),
},
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Migration(migrations.Migration):
options={
'verbose_name': 'Resource',
'verbose_name_plural': 'Resources',
'db_table': 'impress_resource',
'db_table': 'meet_resource',
},
),
migrations.RemoveField(
Expand Down Expand Up @@ -62,12 +62,12 @@ class Migration(migrations.Migration):
('name', models.CharField(max_length=500)),
('resource', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.resource')),
('slug', models.SlugField(blank=True, max_length=100, null=True, unique=True)),
('configuration', models.JSONField(blank=True, default={}, help_text='Values for Magnify parameters to configure the room.', verbose_name='Magnify room configuration')),
('configuration', models.JSONField(blank=True, default={}, help_text='Values for Impress parameters to configure the room.', verbose_name='Impress room configuration')),
],
options={
'verbose_name': 'Room',
'verbose_name_plural': 'Rooms',
'db_table': 'impress_room',
'db_table': 'meet_room',
'ordering': ('name',),
},
bases=('core.resource',),
Expand All @@ -85,7 +85,7 @@ class Migration(migrations.Migration):
options={
'verbose_name': 'Resource access',
'verbose_name_plural': 'Resource accesses',
'db_table': 'impress_resource_access',
'db_table': 'meet_resource_access',
},
),
migrations.AddField(
Expand Down
Loading

0 comments on commit efc5a1e

Please sign in to comment.