diff --git a/.gitignore b/.gitignore index a366d70..d4044cf 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ penta.db volunteers.db .coverage coverage.xml -.vscode \ No newline at end of file +.vscode +deployment/playbook/.ansible_vault diff --git a/deployment/playbook/roles/fosdem_volunteers/tasks/main.yml b/deployment/playbook/roles/fosdem_volunteers/tasks/main.yml index e7f5307..7a4de69 100644 --- a/deployment/playbook/roles/fosdem_volunteers/tasks/main.yml +++ b/deployment/playbook/roles/fosdem_volunteers/tasks/main.yml @@ -3,9 +3,9 @@ name: "{{item}}" state: present with_items: - - python3.5 + - python - nginx - - python3-pip + - virtualenv - name: "Create system user {{app_user}}" user: name: "{{app_user}}" diff --git a/deployment/playbook/volunteers.yml b/deployment/playbook/volunteers.yml index 2708da8..3379375 100644 --- a/deployment/playbook/volunteers.yml +++ b/deployment/playbook/volunteers.yml @@ -1,5 +1,5 @@ --- -- hosts: volunteers +- hosts: volunteers.int.fosdem.org roles: - role: fosdem_volunteers vars: diff --git a/requirements-frozen.txt b/requirements-frozen.txt index e3f2113..fdbd271 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -1,21 +1,47 @@ -arabic-reshaper==2.1.1 -Django==2.2.28 +arabic-reshaper==3.0.0 +asgiref==3.7.2 +asn1crypto==1.5.1 +certifi==2023.7.22 +cffi==1.16.0 +charset-normalizer==3.3.0 +click==8.1.7 +cryptography==41.0.4 +cssselect2==0.7.0 +Django==3.2 django-guardian==2.3.0 django-userena-ce==6.0.1 -easy-thumbnails==2.5 +easy-thumbnails==2.8.5 future==0.18.2 gunicorn==20.0.4 html2text==2014.12.29 html5lib==1.1 +idna==3.4 +lxml==4.9.3 +oscrypto==1.3.0 Pillow==10.0.1 -psycopg2-binary==2.8.6 +psycopg2==2.9.9 +psycopg2-binary==2.9.9 +pycparser==2.21 +pyHanko==0.20.1 +pyhanko-certvalidator==0.24.1 +pypdf==3.16.4 PyPDF2==1.26.0 +pypng==0.20220715.0 python-bidi==0.4.2 python-dateutil==2.8.1 pytz==2021.1 -reportlab==3.5.59 -six==1.15.0 +PyYAML==6.0.1 +qrcode==7.4.2 +reportlab==3.6.13 +requests==2.31.0 +six==1.16.0 sqlparse==0.4.1 static3==0.7.0 +svglib==1.5.1 +tinycss2==1.2.1 +typing_extensions==4.8.0 +tzlocal==5.1 +uritools==4.0.2 +urllib3==2.0.7 webencodings==0.5.1 -xhtml2pdf==0.2.5 +xhtml2pdf==0.2.11 diff --git a/volunteer_mgmt/settings.py b/volunteer_mgmt/settings.py index 05ea6ff..314db33 100644 --- a/volunteer_mgmt/settings.py +++ b/volunteer_mgmt/settings.py @@ -54,7 +54,6 @@ _ = lambda s: s LANGUAGES = ( - ('--', _('select here')), ('en', _('English')), ('fr', _('Francais')), ('de', _('Deutsch')), diff --git a/volunteer_mgmt/wsgi.py b/volunteer_mgmt/wsgi.py index b8f1734..d0c38ad 100644 --- a/volunteer_mgmt/wsgi.py +++ b/volunteer_mgmt/wsgi.py @@ -25,8 +25,9 @@ # file. This includes Django's development server, if the WSGI_APPLICATION # setting points here. from django.core.wsgi import get_wsgi_application -from dj_static import Cling -application = Cling(get_wsgi_application()) +#from dj_static import Cling +#application = Cling(get_wsgi_application()) +application = get_wsgi_application() # Apply WSGI middleware here. # from helloworld.wsgi import HelloWorldApplication