From 03017ae88aab63e98f652205f06711e9a8ddb7ad Mon Sep 17 00:00:00 2001 From: Timon Engelke Date: Thu, 28 Sep 2023 22:54:39 +0200 Subject: [PATCH] Remove build files for join.oeinf.de --- .gitmodules | 3 --- joinoeinf/Dockerfile | 29 ----------------------------- joinoeinf/join.oeinf.de | 1 - joinoeinf/run | 6 ------ joinoeinf/uwsgi-joinoeinf.ini | 32 -------------------------------- 5 files changed, 71 deletions(-) delete mode 100644 joinoeinf/Dockerfile delete mode 160000 joinoeinf/join.oeinf.de delete mode 100755 joinoeinf/run delete mode 100644 joinoeinf/uwsgi-joinoeinf.ini diff --git a/.gitmodules b/.gitmodules index d1bff86..091c5c1 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 "joinoeinf/join.oeinf.de"] - path = joinoeinf/join.oeinf.de - url = git@git.mafiasi.de:oe/join.oeinf.de.git [submodule "preoerb/oerb"] path = preoerb/oerb url = git@git.mafiasi.de:oe/oerb.git diff --git a/joinoeinf/Dockerfile b/joinoeinf/Dockerfile deleted file mode 100644 index 8b682a7..0000000 --- a/joinoeinf/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM docker.io/debian:bullseye - -RUN apt update -RUN apt -y --no-install-recommends install python3 python3-pip python3-setuptools python3-wheel build-essential libldap2-dev python3-dev libsasl2-dev libpython3.9 - -COPY join.oeinf.de /opt/joinoeinf -RUN usermod -u 101 -g 33 -d /opt/joinoeinf www-data - -WORKDIR /opt/joinoeinf - -RUN pip3 install -r requirements.txt -RUN pip3 install uwsgi psycopg2-binary==2.9.5 - -RUN ln -sf /opt/config/settings.py /opt/joinoeinf/join_oeinf/settings.py -RUN ln -sf /opt/static/ /opt/joinoeinf/static - -RUN chown -R www-data:www-data . - -RUN apt remove -y --autoremove python3-pip python3-setuptools python3-wheel python3-dev libsasl2-dev - -COPY uwsgi-joinoeinf.ini /etc/uwsgi/joinoeinf.ini -COPY run /usr/local/bin/run - -VOLUME /opt/static -VOLUME /opt/config - -USER www-data:www-data - -ENTRYPOINT /usr/local/bin/run diff --git a/joinoeinf/join.oeinf.de b/joinoeinf/join.oeinf.de deleted file mode 160000 index c1c0111..0000000 --- a/joinoeinf/join.oeinf.de +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c1c0111f057860f7febd57edcc4cbb193d778d4a diff --git a/joinoeinf/run b/joinoeinf/run deleted file mode 100755 index 87c99a1..0000000 --- a/joinoeinf/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -export USER=www-data HOME=/home/www-data -cd /opt/joinoeinf -python3 ./manage.py migrate -python3 ./manage.py collectstatic --noinput -exec uwsgi /etc/uwsgi/joinoeinf.ini diff --git a/joinoeinf/uwsgi-joinoeinf.ini b/joinoeinf/uwsgi-joinoeinf.ini deleted file mode 100644 index 9c5d342..0000000 --- a/joinoeinf/uwsgi-joinoeinf.ini +++ /dev/null @@ -1,32 +0,0 @@ -[uwsgi] - -procname-master = uwsgi %n -master = true -socket = :3005 - -plugins = python3 - -chdir = /opt/joinoeinf - -module = join_oeinf.wsgi:application -env = DJANGO_SETTINGS_MODULE=join_oeinf.settings -env = LANG='C.UTF-8' -env = LC_ALL='C.UTF-8' - -; drop privileges -uid = www-data -gid = www-data -umask = 027 - -; 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