diff --git a/.github/workflows/build_all_containers.yml b/.github/workflows/build_all_containers.yml index a1e0d06..1201add 100644 --- a/.github/workflows/build_all_containers.yml +++ b/.github/workflows/build_all_containers.yml @@ -17,7 +17,9 @@ jobs: matrix: container: - etherpad + - indico - limesurvey + - minecraft - nextcloud - sogo uses: ./.github/workflows/build_single_container.yml diff --git a/.gitmodules b/.gitmodules index 61f284f..90bd04a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "tauschen/directory"] path = tauschen/directory url = git@git.mafiasi.de:mafiasi-ag/mafiasi-directory.git -[submodule "mensautils/mensa-utils"] - path = mensautils/mensa-utils - url = git@git.mafiasi.de:mafiasi-ag/mensa-utils.git [submodule "engelsystem/engelsystem"] path = engelsystem/engelsystem url = git@github.com:engelsystem/engelsystem.git diff --git a/mensautils/Dockerfile b/mensautils/Dockerfile deleted file mode 100644 index aa98794..0000000 --- a/mensautils/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM debian:bullseye - -RUN apt update -RUN apt -y --no-install-recommends install python3 python3-pip python3-setuptools python3-wheel gcc make uwsgi uwsgi-plugin-python3 libldap2-dev libldap-2.4-2 libsasl2-dev libsasl2-2 python3-dev - -ADD mensa-utils/requirements.txt /app/requirements.txt - -RUN pip3 install django-ldapdb django-auth-ldap sentry-sdk -r /app/requirements.txt - -COPY mensa-utils /app/src -RUN rm -rf /app/src/.pyenv - -WORKDIR /app/src - -RUN ln -sf /app/config/settings.py /app/src/mensautils/settings.py - -COPY uwsgi-mensautils.ini /etc/uwsgi/mensautils.ini -COPY run /usr/local/bin/run - -VOLUME /app/static -VOLUME /app/config - -ENTRYPOINT /usr/local/bin/run diff --git a/mensautils/mensa-utils b/mensautils/mensa-utils deleted file mode 160000 index c2818c1..0000000 --- a/mensautils/mensa-utils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c2818c12771b8242be9387bc01cda02abafd492b diff --git a/mensautils/run b/mensautils/run deleted file mode 100755 index fb0cdc4..0000000 --- a/mensautils/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd /app/src -python3 ./manage.py migrate -python3 ./manage.py collectstatic --noinput -exec uwsgi /etc/uwsgi/mensautils.ini diff --git a/mensautils/uwsgi-mensautils.ini b/mensautils/uwsgi-mensautils.ini deleted file mode 100644 index 7e2118a..0000000 --- a/mensautils/uwsgi-mensautils.ini +++ /dev/null @@ -1,30 +0,0 @@ -[uwsgi] - -procname-master = uwsgi %n -master = true -http-socket = :80 - -plugins = python3 -chdir = /app/src -module = mensautils.wsgi:application - -env = DJANGO_SETTINGS_MODULE=mensautils.settings -env = LANG='C.UTF-8' -env = LC_ALL='C.UTF-8' - -; run with at least 1 process but increase up to 4 when needed -processes = 4 -cheaper = 2 - -; reload whenever this config file changes -; %p is the full path of the current config file -touch-reload = %p - -; disable uWSGI request logging -disable-logging = true - -enable-threads = true - -static-map = /static=/app/static - -cron2 = minute=14,unique=1 python3 ./manage.py fetchcanteen