diff --git a/.gitmodules b/.gitmodules index 0897b9f..61f284f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,22 +4,9 @@ [submodule "tauschen/directory"] path = tauschen/directory url = git@git.mafiasi.de:mafiasi-ag/mafiasi-directory.git -[submodule "preoerb/oerb"] - path = preoerb/oerb - url = git@git.mafiasi.de:oe/oerb.git -[submodule "oestatus/oestatus-v3"] - path = oestatus/oestatus-v3 - url = git@git.mafiasi.de:oe/oestatus-v3.git -[submodule "stammbaum/stammbaum"] - path = stammbaum/stammbaum - url = git@git.mafiasi.de:oe/stammbaum.git [submodule "mensautils/mensa-utils"] path = mensautils/mensa-utils url = git@git.mafiasi.de:mafiasi-ag/mensa-utils.git -[submodule "familiendoell/familiendOEll-auswerter"] - path = familiendoell/familiendOEll-auswerter - url = git@git.mafiasi.de:oe/familiendOEll-auswerter.git - branch = master [submodule "engelsystem/engelsystem"] path = engelsystem/engelsystem url = git@github.com:engelsystem/engelsystem.git diff --git a/familiendoell/Dockerfile b/familiendoell/Dockerfile deleted file mode 100644 index 53f85fe..0000000 --- a/familiendoell/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM docker.io/tiangolo/uwsgi-nginx:python3.9 - -# prepare container -RUN pip3 install psycopg2-binary - -# add application code -COPY prestart.sh /app/prestart.sh -COPY nginx.conf /app/nginx.conf -COPY uwsgi.ini /app/uwsgi.ini -COPY ./familiendOEll-auswerter/requirements.txt /app/src/requirements.txt -RUN pip install --no-cache-dir --upgrade -r /app/src/requirements.txt -COPY ./familiendOEll-auswerter/familiendoellauswerter/ /app/src/ -RUN ln -sf /app/config/settings.py /app/src/familiendoellauswerter/settings.py - -# configure image -ENV UWSGI_INI /app/uwsgi.ini -EXPOSE 80/tcp diff --git a/familiendoell/familiendOEll-auswerter b/familiendoell/familiendOEll-auswerter deleted file mode 160000 index 85d7b30..0000000 --- a/familiendoell/familiendOEll-auswerter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 85d7b30b643e34d43f88cee66ac1e682403b758d diff --git a/familiendoell/nginx.conf b/familiendoell/nginx.conf deleted file mode 100644 index 8d9b0f2..0000000 --- a/familiendoell/nginx.conf +++ /dev/null @@ -1,36 +0,0 @@ -user nginx; -worker_processes 2; -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; -daemon off; -events { - worker_connections 1024; -} -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/log/nginx/access.log main; - sendfile on; - keepalive_timeout 65; - - server { - listen 80; - - location /static { - expires 1h; - alias /app/static; - } - - location / { - include uwsgi_params; - uwsgi_pass unix:///tmp/uwsgi.sock; - } - } -} - - - - diff --git a/familiendoell/prestart.sh b/familiendoell/prestart.sh deleted file mode 100755 index 1556f19..0000000 --- a/familiendoell/prestart.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -e - -mkdir -p /app/storage -python3 /app/src/manage.py migrate -python3 /app/src/manage.py collectstatic --noinput diff --git a/familiendoell/uwsgi.ini b/familiendoell/uwsgi.ini deleted file mode 100644 index 754dc91..0000000 --- a/familiendoell/uwsgi.ini +++ /dev/null @@ -1,3 +0,0 @@ -[uwsgi] -chdir = /app/src/ -module = familiendoellauswerter.wsgi:application diff --git a/oestatus/Dockerfile b/oestatus/Dockerfile deleted file mode 100644 index 73617ce..0000000 --- a/oestatus/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM debian:bullseye - -RUN apt update -RUN apt -y --no-install-recommends install python3 python3-pip uwsgi uwsgi-plugin-python3 python3-setuptools python3-wheel - -COPY oestatus-v3 /app/src - -WORKDIR /app/src - -RUN pip3 install -r requirements.txt - -COPY uwsgi-oestatus.ini /etc/uwsgi/oestatus.ini -COPY run /usr/local/bin/run - -VOLUME /app/config - -CMD /usr/local/bin/run diff --git a/oestatus/oestatus-v3 b/oestatus/oestatus-v3 deleted file mode 160000 index d2d243d..0000000 --- a/oestatus/oestatus-v3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d2d243dd59c67d2db1a13bc050bcce84774c1d9a diff --git a/oestatus/run b/oestatus/run deleted file mode 100755 index c641576..0000000 --- a/oestatus/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -python3 /app/src/manage.py migrate -python3 /app/src/manage.py collectstatic --noinput -exec uwsgi /etc/uwsgi/oestatus.ini diff --git a/oestatus/uwsgi-oestatus.ini b/oestatus/uwsgi-oestatus.ini deleted file mode 100644 index 5d4ef18..0000000 --- a/oestatus/uwsgi-oestatus.ini +++ /dev/null @@ -1,29 +0,0 @@ -[uwsgi] - -procname-master = uwsgi %n -master = true -http-socket = :8000 - -plugins = python3 - -chdir = /app/src - -module = oestatusv3.wsgi:application -env = DJANGO_SETTINGS_MODULE=oestatusv3.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 = 2 -cheaper = 1 - -; 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 diff --git a/preoerb/Dockerfile b/preoerb/Dockerfile deleted file mode 100644 index 3ae1556..0000000 --- a/preoerb/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM debian:buster-slim - -RUN apt update && apt install -y --no-install-recommends python3-pip python3-setuptools python3-wheel nginx make && mkdir /app && rm /var/www/html/index.nginx-debian.html && pip3 install mkdocs -ADD oerb/Digitale_OERB /app/src -ADD nginx.conf /etc/nginx/sites-enabled/default -WORKDIR /app/src -RUN make && mv en/site /var/www/html/en && mv de/site /var/www/html/de -ENTRYPOINT nginx -g "daemon off;" diff --git a/preoerb/nginx.conf b/preoerb/nginx.conf deleted file mode 100644 index 4e165fb..0000000 --- a/preoerb/nginx.conf +++ /dev/null @@ -1,18 +0,0 @@ -server { - listen 80 default_server; - listen [::]:80 default_server; - - root /var/www/html; - - index index.html index.htm; - - server_name _; - - location = / { - return 302 /de/; - } - - location / { - try_files $uri $uri/ =404; - } -} diff --git a/preoerb/oerb b/preoerb/oerb deleted file mode 160000 index fad78a1..0000000 --- a/preoerb/oerb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fad78a1ca373951f47c3bf68034a9031c0e38899 diff --git a/stammbaum/Dockerfile b/stammbaum/Dockerfile deleted file mode 100644 index 66b6407..0000000 --- a/stammbaum/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM debian:bullseye - -RUN apt update -RUN apt -y --no-install-recommends install python3 python3-pip python3-setuptools python3-wheel graphviz build-essential uwsgi uwsgi-plugin-python3 - -COPY stammbaum /app/src -RUN rm -rf /app/src/.pyenv - -WORKDIR /app/src - -RUN pip3 install -r requirements.txt -RUN pip3 install psycopg2-binary - -RUN ln -sf /app/config/settings.py /app/src/settings.py - -RUN apt remove -y --autoremove python3-pip python3-setuptools python3-wheel build-essential - -COPY uwsgi-stammbaum.ini /etc/uwsgi/stammbaum.ini -COPY run /usr/local/bin/run - -VOLUME /app/static -VOLUME /app/media -VOLUME /app/config - -ENTRYPOINT /usr/local/bin/run diff --git a/stammbaum/run b/stammbaum/run deleted file mode 100755 index d45ac12..0000000 --- a/stammbaum/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/stammbaum.ini diff --git a/stammbaum/stammbaum b/stammbaum/stammbaum deleted file mode 160000 index 5e5304b..0000000 --- a/stammbaum/stammbaum +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5e5304b62bfc9e66a6db220b736d4aa3bc655d01 diff --git a/stammbaum/uwsgi-stammbaum.ini b/stammbaum/uwsgi-stammbaum.ini deleted file mode 100644 index 427dc2a..0000000 --- a/stammbaum/uwsgi-stammbaum.ini +++ /dev/null @@ -1,30 +0,0 @@ -[uwsgi] - -procname-master = uwsgi %n -master = true -http-socket = :80 - -plugins = python3 - -chdir = /app/src - -module = wsgi:application -env = DJANGO_SETTINGS_MODULE=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 = 2 -cheaper = 1 - -; 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 -static-map = /media=/app/media