diff --git a/.forgejo/workflows/pull_request.yml b/.forgejo/workflows/pull_request.yml deleted file mode 100644 index 1171616..0000000 --- a/.forgejo/workflows/pull_request.yml +++ /dev/null @@ -1,20 +0,0 @@ -on: - pull_request: - -jobs: - test: - runs-on: docker - container: - image: ghcr.io/catthehacker/ubuntu:act-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: '3.11' - cache-dependency-path: '**/requirements.dev.txt' - - name: Install dependencies - working-directory: core - run: pip3 install -r requirements.dev.txt - - name: Run django tests - working-directory: core - run: python3 manage.py test diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml deleted file mode 100644 index 3b44d24..0000000 --- a/.forgejo/workflows/testing.yml +++ /dev/null @@ -1,60 +0,0 @@ -on: - push: - branches: - - testing - -jobs: - test: - runs-on: docker - container: - image: ghcr.io/catthehacker/ubuntu:act-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: '3.11' - cache-dependency-path: '**/requirements.dev.txt' - - name: Install dependencies - working-directory: core - run: pip3 install -r requirements.dev.txt - - name: Run django tests - working-directory: core - run: python3 manage.py test - - deploy: - needs: [test] - runs-on: docker - steps: - - uses: actions/checkout@v4 - - name: Install ansible - run: | - apt update -y - apt install python3-pip -y - python3 -m pip install ansible - python3 -m pip install ansible-lint - - - name: Populate relevant files - run: | - mkdir ~/.ssh - echo "${{ secrets.C3LF_SSH_TESTING }}" > ~/.ssh/id_ed25519 - chmod 0600 ~/.ssh/id_ed25519 - ls -lah ~/.ssh - command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y ) - eval $(ssh-agent -s) - ssh-add ~/.ssh/id_ed25519 - echo "andromeda.lab.or.it ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDXPoO0PE+B9PYwbGaLo98zhbmjAkp6eBtVeZe43v/+T" >> ~/.ssh/known_hosts - mkdir /etc/ansible - echo "${{ secrets.C3LF_INVENTORY_TESTING }}" > /etc/ansible/hosts - - - name: Check ansible version - run: | - ansible --version - - - name: List ansible hosts - run: | - ansible -m ping Andromeda - - - name: Deploy testing - run: | - cd deploy/ansible - ansible-playbook playbooks/deploy-c3lf-sys3.yml diff --git a/core/.coveragerc b/core/.coveragerc deleted file mode 100644 index 14c1fba..0000000 --- a/core/.coveragerc +++ /dev/null @@ -1,14 +0,0 @@ -[run] -source = . - -[report] -fail_under = 100 -show_missing = True -skip_covered = True -omit = - */tests/* - */migrations/* - core/asgi.py - core/wsgi.py - core/settings.py - manage.py \ No newline at end of file diff --git a/core/core/settings.py b/core/core/settings.py index 2d4a818..db23180 100644 --- a/core/core/settings.py +++ b/core/core/settings.py @@ -15,9 +15,6 @@ import sys import dotenv from pathlib import Path -def truthy_str(s): - return s.lower() in ['true', '1', 't', 'y', 'yes', 'yeah', 'yup', 'certainly', 'sure', 'positive', 'uh-huh', '👍'] - # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -27,10 +24,10 @@ dotenv.load_dotenv(BASE_DIR / '.env') # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.getenv('DJANGO_SECRET_KEY', 'django-insecure-tm*$w_14iqbiy-!7(8#ba7j+_@(7@rf2&a^!=shs&$03b%2*rv') +SECRET_KEY = 'django-insecure-tm*$w_14iqbiy-!7(8#ba7j+_@(7@rf2&a^!=shs&$03b%2*rv' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = truthy_str(os.getenv('DEBUG_MODE_ACTIVE', 'False')) +DEBUG = True ALLOWED_HOSTS = [os.getenv('HTTP_HOST', 'localhost')] @@ -43,8 +40,6 @@ LEGACY_USER_PASSWORD = os.getenv('LEGACY_API_PASSWORD', 'legacy_password') SYSTEM3_VERSION = "0.0.0-dev.0" -ACTIVE_SPAM_TRAINING = truthy_str(os.getenv('ACTIVE_SPAM_TRAINING', 'False')) - # Application definition INSTALLED_APPS = [ @@ -55,7 +50,6 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'django_extensions', - 'django_prometheus', 'rest_framework', 'knox', 'drf_yasg', @@ -91,7 +85,6 @@ SWAGGER_SETTINGS = { } MIDDLEWARE = [ - 'django_prometheus.middleware.PrometheusBeforeMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -99,7 +92,6 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django_prometheus.middleware.PrometheusAfterMiddleware', ] ROOT_URLCONF = 'core.urls' @@ -212,12 +204,10 @@ CHANNEL_LAYERS = { 'default': { 'BACKEND': 'channels_redis.core.RedisChannelLayer', 'CONFIG': { - 'hosts': [(os.getenv('REDIS_HOST', 'localhost'), 6379)], + 'hosts': [('localhost', 6379)], }, } } -PROMETHEUS_METRIC_NAMESPACE = 'c3lf' - TEST_RUNNER = 'core.test_runner.FastTestRunner' diff --git a/core/core/urls.py b/core/core/urls.py index df6e0d0..b0161bb 100644 --- a/core/core/urls.py +++ b/core/core/urls.py @@ -32,5 +32,4 @@ urlpatterns = [ path('api/2/', include('notify_sessions.api_v2')), path('api/2/', include('authentication.api_v2')), path('api/', get_info), - path('', include('django_prometheus.urls')), ] diff --git a/core/inventory/serializers.py b/core/inventory/serializers.py index 5a26623..fd39c3a 100644 --- a/core/inventory/serializers.py +++ b/core/inventory/serializers.py @@ -3,21 +3,12 @@ from rest_framework import serializers from files.models import File from inventory.models import Event, Container, Item -from mail.models import EventAddress - - -class EventAdressSerializer(serializers.ModelSerializer): - class Meta: - model = EventAddress - fields = ['address'] class EventSerializer(serializers.ModelSerializer): - addresses = EventAdressSerializer(many=True, required=False) - class Meta: model = Event - fields = ['eid', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end', 'addresses'] + fields = ['eid', 'slug', 'name', 'start', 'end', 'pre_start', 'post_end'] read_only_fields = ['eid'] diff --git a/core/inventory/tests/v2/test_events.py b/core/inventory/tests/v2/test_events.py index affbd0e..7973313 100644 --- a/core/inventory/tests/v2/test_events.py +++ b/core/inventory/tests/v2/test_events.py @@ -54,15 +54,3 @@ class EventTestCase(TestCase): response = client.delete(f'/api/2/events/{event.eid}/') self.assertEqual(response.status_code, 204) self.assertEqual(len(Event.objects.all()), 1) - - def test_items2(self): - from mail.models import EventAddress - event1 = Event.objects.create(slug='TEST1', name='Event') - EventAddress.objects.create(event=Event.objects.get(slug='TEST1'), address='foo@bar.baz') - response = self.client.get('/api/2/events/') - self.assertEqual(response.status_code, 200) - self.assertEqual(1, len(response.json())) - self.assertEqual('TEST1', response.json()[0]['slug']) - self.assertEqual('Event', response.json()[0]['name']) - self.assertEqual(1, len(response.json()[0]['addresses'])) - diff --git a/core/mail/migrations/0005_alter_eventaddress_event.py b/core/mail/migrations/0005_alter_eventaddress_event.py deleted file mode 100644 index 30b79bf..0000000 --- a/core/mail/migrations/0005_alter_eventaddress_event.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.2.7 on 2024-11-03 18:30 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('inventory', '0004_alter_event_created_at_alter_item_created_at'), - ('mail', '0004_alter_emailattachment_file'), - ] - - operations = [ - migrations.AlterField( - model_name='eventaddress', - name='event', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='addresses', to='inventory.event'), - ), - ] diff --git a/core/mail/migrations/0006_email_raw_file.py b/core/mail/migrations/0006_email_raw_file.py deleted file mode 100644 index 4086af8..0000000 --- a/core/mail/migrations/0006_email_raw_file.py +++ /dev/null @@ -1,36 +0,0 @@ -# Generated by Django 4.2.7 on 2024-11-08 20:37 -from django.core.files.base import ContentFile -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ('mail', '0005_alter_eventaddress_event'), - ] - - def move_raw_mails_to_file(apps, schema_editor): - Email = apps.get_model('mail', 'Email') - for email in Email.objects.all(): - raw_content = email.raw - path = "mail_{}".format(email.id) - if len(raw_content): - email.raw_file.save(path, ContentFile(raw_content)) - email.save() - - operations = [ - migrations.AddField( - model_name='email', - name='raw_file', - field=models.FileField(null=True, upload_to='raw_mail/'), - ), - migrations.RunPython(move_raw_mails_to_file), - migrations.RemoveField( - model_name='email', - name='raw', - ), - migrations.AlterField( - model_name='email', - name='raw_file', - field=models.FileField(upload_to='raw_mail/'), - ), - ] diff --git a/core/mail/models.py b/core/mail/models.py index 2215fbb..4bd0973 100644 --- a/core/mail/models.py +++ b/core/mail/models.py @@ -3,7 +3,7 @@ import random from django.db import models from django_softdelete.models import SoftDeleteModel -from core.settings import MAIL_DOMAIN, ACTIVE_SPAM_TRAINING +from core.settings import MAIL_DOMAIN from files.models import AbstractFile from inventory.models import Event from tickets.models import IssueThread @@ -18,7 +18,7 @@ class Email(SoftDeleteModel): recipient = models.CharField(max_length=255) reference = models.CharField(max_length=255, null=True, unique=True) in_reply_to = models.CharField(max_length=255, null=True) - raw_file = models.FileField(upload_to='raw_mail/') + raw = models.TextField() issue_thread = models.ForeignKey(IssueThread, models.SET_NULL, null=True, related_name='emails') event = models.ForeignKey(Event, models.SET_NULL, null=True) @@ -28,22 +28,10 @@ class Email(SoftDeleteModel): self.reference = f'<{random.randint(0, 1000000000):09}@{MAIL_DOMAIN}>' self.save() - def train_spam(self): - if ACTIVE_SPAM_TRAINING: - import subprocess - path = self.raw_file.path - subprocess.run(["rspamc", "learn_spam", path]) - - def train_ham(self): - if ACTIVE_SPAM_TRAINING: - import subprocess - path = self.raw_file.path - subprocess.run(["rspamc", "learn_ham", path]) - class EventAddress(models.Model): id = models.AutoField(primary_key=True) - event = models.ForeignKey(Event, models.SET_NULL, null=True, related_name='addresses') + event = models.ForeignKey(Event, models.SET_NULL, null=True) address = models.CharField(max_length=255) diff --git a/core/mail/protocol.py b/core/mail/protocol.py index 926e8c2..cfd25ce 100644 --- a/core/mail/protocol.py +++ b/core/mail/protocol.py @@ -1,5 +1,4 @@ import logging -from re import match import aiosmtplib from channels.layers import get_channel_layer @@ -11,10 +10,6 @@ from notify_sessions.models import SystemEvent from tickets.models import IssueThread -class SpecialMailException(Exception): - pass - - def find_quoted_printable(s, marker): positions = [i for i in range(len(s)) if s.lower().startswith('=?utf-8?' + marker + '?', i)] for pos in positions: @@ -185,13 +180,13 @@ def receive_email(envelope, log=None): header_in_reply_to = parsed.get('In-Reply-To') header_message_id = parsed.get('Message-ID') - if match(r'^([a-zA-Z ]*<)?MAILER-DAEMON@', header_from) and envelope.mail_from.strip("<>") == "": - log.warning("Ignoring mailer daemon") - raise SpecialMailException("Ignoring mailer daemon") + if header_from != envelope.mail_from: + log.warning("Header from does not match envelope from") + log.info(f"Header from: {header_from}, envelope from: {envelope.mail_from}") - if Email.objects.filter(reference=header_message_id).exists(): # break before issue thread is created - log.warning("Email already exists") - raise Exception("Email already exists") + if header_to != envelope.rcpt_tos[0]: + log.warning("Header to does not match envelope to") + log.info(f"Header to: {header_to}, envelope to: {envelope.rcpt_tos[0]}") recipient = envelope.rcpt_tos[0].lower() if envelope.rcpt_tos else header_to.lower() sender = envelope.mail_from if envelope.mail_from else header_from @@ -206,7 +201,7 @@ def receive_email(envelope, log=None): email = Email.objects.create( sender=sender, recipient=recipient, body=body, subject=subject, reference=header_message_id, - in_reply_to=header_in_reply_to, raw_file=ContentFile(envelope.content), event=target_event, + in_reply_to=header_in_reply_to, raw=envelope.content, event=target_event, issue_thread=active_issue_thread) for attachment in attachments: email.attachments.add(attachment) @@ -238,7 +233,7 @@ Your c3lf (Cloakroom + Lost&Found) Team'''.format(active_issue_thread.short_uuid active_issue_thread.state = 'pending_open' active_issue_thread.save() - return email, new, reply, active_issue_thread + return email, new, reply class LMTPHandler: @@ -260,7 +255,7 @@ class LMTPHandler: content = None try: content = envelope.content - email, new, reply, thread = await receive_email(envelope, log) + email, new, reply = await receive_email(envelope, log) log.info(f"Created email {email.id}") systemevent = await database_sync_to_async(SystemEvent.objects.create)(type='email received', reference=email.id) @@ -268,20 +263,14 @@ class LMTPHandler: channel_layer = get_channel_layer() await channel_layer.group_send( 'general', {"type": "generic.event", "name": "send_message_to_frontend", "event_id": systemevent.id, - "message": "email received"}) + "message": "email received"} + ) log.info(f"Sent message to frontend") if new and reply: log.info('Sending message to %s' % reply['To']) await send_smtp(reply) log.info("Sent auto reply") - return '250 Message accepted for delivery' - except SpecialMailException as e: - import uuid - random_filename = 'special-' + str(uuid.uuid4()) - with open(random_filename, 'wb') as f: - f.write(content) - log.warning(f"Special mail exception: {e} saved to {random_filename}") return '250 Message accepted for delivery' except Exception as e: from hashlib import sha256 diff --git a/core/mail/tests/v2/test_mails.py b/core/mail/tests/v2/test_mails.py index 3df56ca..ac03bac 100644 --- a/core/mail/tests/v2/test_mails.py +++ b/core/mail/tests/v2/test_mails.py @@ -760,6 +760,7 @@ dGVzdGltYWdl response = self.client.post(f'/api/2/tickets/{issue_thread.id}/reply/', { 'message': 'test' }) + aiosmtplib.send.assert_called_once() self.assertEqual(response.status_code, 201) self.assertEqual(5, len(Email.objects.all())) self.assertEqual(5, len(Email.objects.filter(issue_thread=issue_thread))) @@ -775,7 +776,6 @@ dGVzdGltYWdl self.assertEqual('test subject', IssueThread.objects.all()[0].name) self.assertEqual('pending_new', IssueThread.objects.all()[0].state) self.assertEqual(None, IssueThread.objects.all()[0].assigned_to) - aiosmtplib.send.assert_called_once() def test_mail_4byte_unicode_emoji(self): from aiosmtpd.smtp import Envelope diff --git a/core/requirements.dev.txt b/core/requirements.dev.txt index 3807a6c..8e68f67 100644 --- a/core/requirements.dev.txt +++ b/core/requirements.dev.txt @@ -1,6 +1,3 @@ -aiodns==3.2.0 -aiohttp==3.9.5 -aiosignal==1.3.1 aiosmtpd==1.4.4.post2 aiosmtplib==3.0.1 anyio==4.1.0 @@ -31,7 +28,6 @@ django-rest-knox==4.2.0 django-soft-delete==0.9.21 djangorestframework==3.14.0 drf-yasg==1.21.7 -frozenlist==1.4.1 h11==0.14.0 hyperlink==21.0.0 idna==3.4 @@ -42,13 +38,11 @@ Jinja2==3.1.2 MarkupSafe==2.1.3 msgpack==1.0.7 msgpack-python==0.5.6 -multidict==6.0.5 openapi-codec==1.3.2 packaging==23.2 Pillow==10.1.0 pyasn1==0.5.1 pyasn1-modules==0.3.0 -pycares==4.4.0 pycparser==2.21 pyOpenSSL==23.3.0 python-dotenv==1.0.0 @@ -71,7 +65,4 @@ urllib3==2.1.0 uvicorn==0.24.0.post1 watchfiles==0.21.0 websockets==12.0 -yarl==1.9.4 zope.interface==6.1 -django-prometheus==2.3.1 -prometheus_client==0.21.0 diff --git a/core/requirements.prod.txt b/core/requirements.prod.txt index ee69fe7..6a4f32a 100644 --- a/core/requirements.prod.txt +++ b/core/requirements.prod.txt @@ -1,6 +1,3 @@ -aiodns==3.2.0 -aiohttp==3.9.5 -aiosignal==1.3.1 aiosmtpd==1.4.4.post2 aiosmtplib==3.0.1 asgiref==3.7.2 @@ -41,5 +38,3 @@ urllib3==2.1.0 uvicorn==0.24.0.post1 watchfiles==0.21.0 websockets==12.0 -django-prometheus==2.3.1 -prometheus_client==0.21.0 diff --git a/core/tickets/api_v2.py b/core/tickets/api_v2.py index 596bd9b..f8f746e 100644 --- a/core/tickets/api_v2.py +++ b/core/tickets/api_v2.py @@ -10,7 +10,6 @@ from asgiref.sync import async_to_sync from channels.layers import get_channel_layer from core.settings import MAIL_DOMAIN -from inventory.models import Event from mail.models import Email from mail.protocol import send_smtp, make_reply, collect_references from notify_sessions.models import SystemEvent diff --git a/core/tickets/migrations/0011_train_old_spam.py b/core/tickets/migrations/0011_train_old_spam.py deleted file mode 100644 index 206cbb4..0000000 --- a/core/tickets/migrations/0011_train_old_spam.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 4.2.7 on 2024-06-23 02:17 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - dependencies = [ - ('mail', '0006_email_raw_file'), - ('tickets', '0010_issuethread_event_itemrelation_and_more'), - ] - - def train_old_mails(apps, schema_editor): - from tickets.models import IssueThread - for t in IssueThread.objects.all(): - try: - state = t.state - i = 0 - for e in t.emails.all(): - if e.raw_file: - if state == 'closed_spam' and i == 0: - e.train_spam() - else: - e.train_ham() - i += 1 - except: - pass - - operations = [ - migrations.RunPython(train_old_mails), - ] diff --git a/core/tickets/models.py b/core/tickets/models.py index aff5d6c..db427fe 100644 --- a/core/tickets/models.py +++ b/core/tickets/models.py @@ -60,8 +60,6 @@ class IssueThread(SoftDeleteModel): if self.state == value: return self.state_changes.create(state=value) - if value == 'closed_spam' and self.emails.exists(): - self.emails.first().train_spam() @property def assigned_to(self): diff --git a/deploy/ansible/inventory.yml.sample b/deploy/ansible/inventory.yml.sample index 2a50efd..6ba14ac 100644 --- a/deploy/ansible/inventory.yml.sample +++ b/deploy/ansible/inventory.yml.sample @@ -11,6 +11,4 @@ c3lf-nodes: mail_domain: main_email: legacy_api_user: - legacy_api_password: - debug_mode_active: false - django_secret_key: 'django-insecure-tm*$w_14iqbiy-!7(8#ba7j+_@(7@rf2&a^!=shs&$03b%2*rv' \ No newline at end of file + legacy_api_password: \ No newline at end of file diff --git a/deploy/ansible/playbooks/templates/django.env.j2 b/deploy/ansible/playbooks/templates/django.env.j2 index c9b1c83..72a0c30 100644 --- a/deploy/ansible/playbooks/templates/django.env.j2 +++ b/deploy/ansible/playbooks/templates/django.env.j2 @@ -1,4 +1,3 @@ -REDIS_HOST=localhost DB_HOST=localhost DB_PORT=3306 DB_NAME=c3lf_sys3 @@ -10,6 +9,3 @@ LEGACY_API_USER={{ legacy_api_user }} LEGACY_API_PASSWORD={{ legacy_api_password }} MEDIA_ROOT=/var/www/c3lf-sys3/userfiles STATIC_ROOT=/var/www/c3lf-sys3/staticfiles -ACTIVE_SPAM_TRAINING=True -DEBUG_MODE_ACTIVE={{ debug_mode_active }} -DJANGO_SECRET_KEY={{ django_secret_key }} diff --git a/deploy/ansible/playbooks/templates/nginx.conf.j2 b/deploy/ansible/playbooks/templates/nginx.conf.j2 index 3533f37..608ffd5 100644 --- a/deploy/ansible/playbooks/templates/nginx.conf.j2 +++ b/deploy/ansible/playbooks/templates/nginx.conf.j2 @@ -70,13 +70,6 @@ server { alias /var/www/c3lf-sys3/staticfiles/; } - location /metrics { - allow 95.156.226.90; - allow 127.0.0.1; - allow ::1; - deny all; - } - listen 443 ssl http2; # managed by Certbot ssl_certificate /etc/letsencrypt/live/{{ web_domain }}/fullchain.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/{{ web_domain }}/privkey.pem; # managed by Certbot diff --git a/deploy/dev/Dockerfile.backend b/deploy/dev/Dockerfile.backend deleted file mode 100644 index 19c2efd..0000000 --- a/deploy/dev/Dockerfile.backend +++ /dev/null @@ -1,13 +0,0 @@ -FROM python:3.11-bookworm -LABEL authors="lagertonne" - -ENV PYTHONUNBUFFERED 1 -RUN mkdir /code -WORKDIR /code -COPY requirements.dev.txt /code/ -COPY requirements.prod.txt /code/ -RUN apt update && apt install -y mariadb-client -RUN pip install -r requirements.dev.txt -RUN pip install -r requirements.prod.txt -RUN pip install mysqlclient -COPY .. /code/ \ No newline at end of file diff --git a/deploy/dev/Dockerfile.frontend b/deploy/dev/Dockerfile.frontend deleted file mode 100644 index 0a41d1a..0000000 --- a/deploy/dev/Dockerfile.frontend +++ /dev/null @@ -1,6 +0,0 @@ -FROM docker.io/node:22 - -RUN mkdir /web -WORKDIR /web -COPY package.json /web/ -RUN npm install diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml deleted file mode 100644 index dff5ab3..0000000 --- a/deploy/dev/docker-compose.yml +++ /dev/null @@ -1,48 +0,0 @@ -services: - core: - build: - context: ../../core - dockerfile: ../deploy/dev/Dockerfile.backend - command: bash -c 'python manage.py migrate && python manage.py runserver 0.0.0.0:8000' - environment: - - HTTP_HOST=core - - DB_HOST=db - - DB_PORT=3306 - - DB_NAME=system3 - - DB_USER=system3 - - DB_PASSWORD=system3 - volumes: - - ../../core:/code - ports: - - "8000:8000" - depends_on: - - db - - frontend: - build: - context: ../../web - dockerfile: ../deploy/dev/Dockerfile.frontend - command: npm run serve - volumes: - - ../../web:/web:ro - - /web/node_modules - - ./vue.config.js:/web/vue.config.js - ports: - - "8080:8080" - depends_on: - - core - - db: - image: mariadb - environment: - MARIADB_RANDOM_ROOT_PASSWORD: true - MARIADB_DATABASE: system3 - MARIADB_USER: system3 - MARIADB_PASSWORD: system3 - volumes: - - mariadb_data:/var/lib/mysql - ports: - - "3306:3306" - -volumes: - mariadb_data: \ No newline at end of file diff --git a/deploy/dev/vue.config.js b/deploy/dev/vue.config.js deleted file mode 100644 index f8f3c26..0000000 --- a/deploy/dev/vue.config.js +++ /dev/null @@ -1,27 +0,0 @@ -// vue.config.js - -module.exports = { - devServer: { - headers: { - "Access-Control-Allow-Origin": "*", - "Access-Control-Allow-Headers": "*", - "Access-Control-Allow-Methods": "*" - }, - proxy: { - '^/media/2': { - target: 'http://core:8000/', - }, - '^/api/2': { - target: 'http://core:8000/', - }, - '^/api/1': { - target: 'http://core:8000/', - }, - '^/ws/2': { - target: 'http://core:8000/', - ws: true, - logLevel: 'debug', - }, - } - } -} \ No newline at end of file diff --git a/deploy/testing/Dockerfile.backend b/deploy/testing/Dockerfile.backend deleted file mode 100644 index c968994..0000000 --- a/deploy/testing/Dockerfile.backend +++ /dev/null @@ -1,11 +0,0 @@ -FROM python:3.11-bookworm -LABEL authors="lagertonne" - -ENV PYTHONUNBUFFERED 1 -RUN mkdir /code -WORKDIR /code -COPY requirements.prod.txt /code/ -RUN apt update && apt install -y mariadb-client -RUN pip install -r requirements.prod.txt -RUN pip install mysqlclient -COPY .. /code/ \ No newline at end of file diff --git a/deploy/testing/Dockerfile.frontend b/deploy/testing/Dockerfile.frontend deleted file mode 100644 index 0a41d1a..0000000 --- a/deploy/testing/Dockerfile.frontend +++ /dev/null @@ -1,6 +0,0 @@ -FROM docker.io/node:22 - -RUN mkdir /web -WORKDIR /web -COPY package.json /web/ -RUN npm install diff --git a/deploy/testing/docker-compose.yml b/deploy/testing/docker-compose.yml deleted file mode 100644 index e93e901..0000000 --- a/deploy/testing/docker-compose.yml +++ /dev/null @@ -1,55 +0,0 @@ -services: - redis: - image: redis - ports: - - "6379:6379" - - db: - image: mariadb - environment: - MARIADB_RANDOM_ROOT_PASSWORD: true - MARIADB_DATABASE: system3 - MARIADB_USER: system3 - MARIADB_PASSWORD: system3 - volumes: - - mariadb_data:/var/lib/mysql - ports: - - "3306:3306" - - core: - build: - context: ../../core - dockerfile: ../deploy/testing/Dockerfile.backend - command: bash -c 'python manage.py migrate && python /code/server.py' - environment: - - HTTP_HOST=core - - REDIS_HOST=redis - - DB_HOST=db - - DB_PORT=3306 - - DB_NAME=system3 - - DB_USER=system3 - - DB_PASSWORD=system3 - volumes: - - ../../core:/code - ports: - - "8000:8000" - depends_on: - - db - - redis - - frontend: - build: - context: ../../web - dockerfile: ../deploy/testing/Dockerfile.frontend - command: npm run serve - volumes: - - ../../web:/web:ro - - /web/node_modules - - ./vue.config.js:/web/vue.config.js - ports: - - "8080:8080" - depends_on: - - core - -volumes: - mariadb_data: \ No newline at end of file diff --git a/deploy/testing/vue.config.js b/deploy/testing/vue.config.js deleted file mode 100644 index f8f3c26..0000000 --- a/deploy/testing/vue.config.js +++ /dev/null @@ -1,27 +0,0 @@ -// vue.config.js - -module.exports = { - devServer: { - headers: { - "Access-Control-Allow-Origin": "*", - "Access-Control-Allow-Headers": "*", - "Access-Control-Allow-Methods": "*" - }, - proxy: { - '^/media/2': { - target: 'http://core:8000/', - }, - '^/api/2': { - target: 'http://core:8000/', - }, - '^/api/1': { - target: 'http://core:8000/', - }, - '^/ws/2': { - target: 'http://core:8000/', - ws: true, - logLevel: 'debug', - }, - } - } -} \ No newline at end of file diff --git a/web/src/components/AsyncLoader.vue b/web/src/components/AsyncLoader.vue deleted file mode 100644 index 00bf841..0000000 --- a/web/src/components/AsyncLoader.vue +++ /dev/null @@ -1,133 +0,0 @@ - - - - - \ No newline at end of file diff --git a/web/src/components/Navbar.vue b/web/src/components/Navbar.vue index 686f324..fb0736b 100644 --- a/web/src/components/Navbar.vue +++ b/web/src/components/Navbar.vue @@ -29,7 +29,16 @@ - +
+ +