From e9cb303b0917e0e966a070882d4aded8d554e5ec Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 22 Oct 2018 22:39:13 +0200 Subject: [PATCH 1/3] Use correct django-multisite version We had multiple versions of django-multisite in the requirements.txt. This commit removes the wrong version that caused server not to start with an error File "/usr/local/lib/python3.5/site-packages/django/contrib/sites/models.py" in get_current 65. return self._get_site_by_id(site_id) File "/usr/local/lib/python3.5/site-packages/django/contrib/sites/models.py" in _get_site_by_id 37. return SITE_CACHE[site_id] File "/usr/local/lib/python3.5/site-packages/multisite/hacks.py" in __getitem__ 124. raise KeyError(key) --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4646c6c9..a14617a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,7 +34,6 @@ django-meta==1.2 django-meta-mixin==0.3.0 django-model-utils==2.5 django-mptt==0.8.4 -django-multisite==1.4.1 django-parler==1.6.3 django-phonenumber-field==1.1.0 django-polymorphic==0.9.2 From 2c674572c9ed96d240b51273b3dbc85c13f62422 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 22 Oct 2018 23:25:05 +0200 Subject: [PATCH 2/3] Update Changelog --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index e6621e35..b85dd4ff 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +Next: + * bugfix: Use correct version of django-multisite (MR #676) 2.4.1: 2018-10-18 * bugfix: Update pycryptodome module from 3.4 to 3.6.6 (PR #674) 2.4: 2018-10-18 From 1bfb710ee68e844fcb8e861a5745318d6eaded47 Mon Sep 17 00:00:00 2001 From: Aatish Neupane Date: Sun, 11 Nov 2018 17:01:19 +0100 Subject: [PATCH 3/3] Change datacenterlight.ch message form to send email to support@ungleich.ch --- datacenterlight/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 445ff7cf..5dc3a3d3 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -64,7 +64,7 @@ class ContactUsView(FormView): sender=form.cleaned_data.get('email') ), 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, - 'to': [from_emails.get(from_page, 'info@ungleich.ch')], + 'to': [from_emails.get(from_page, 'support@ungleich.ch')], 'body': "\n".join( ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]), 'reply_to': [form.cleaned_data.get('email')],