From 95c07fbed13d8d650c00816d8f0faa1f17228c8b Mon Sep 17 00:00:00 2001
From: "app@dynamicweb-production" <app@dynamicweb-production>
Date: Wed, 23 Mar 2022 10:46:12 +0100
Subject: [PATCH] Change to dcl-orders for new vm and removing
 ipv6onlyhosting.{net,ch} references

---
 datacenterlight/tasks.py                      | 4 ++--
 digitalglarus/locale/de/LC_MESSAGES/django.po | 7 +++----
 dynamicweb/settings/base.py                   | 2 --
 dynamicweb/settings/prod.py                   | 2 --
 templates/gdpr/gdpr_banner.html               | 2 --
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/datacenterlight/tasks.py b/datacenterlight/tasks.py
index 9c98b729..899b506f 100644
--- a/datacenterlight/tasks.py
+++ b/datacenterlight/tasks.py
@@ -195,7 +195,7 @@ def handle_metadata_and_emails(order_id, vm_id, manager, user, specs,
     email_data = {
         'subject': settings.DCL_TEXT + " Order from %s" % context['email'],
         'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
-        'to': ['info@ungleich.ch'],
+        'to': ['dcl-orders@ungleich.ch'],
         'body': "\n".join(
             ["%s=%s" % (k, v) for (k, v) in context.items()]),
         'reply_to': [context['email']],
@@ -233,4 +233,4 @@ def handle_metadata_and_emails(order_id, vm_id, manager, user, specs,
 
         logger.debug("New VM ID is {vm_id}".format(vm_id=vm_id))
         if vm_id > 0:
-            get_or_create_vm_detail(custom_user, manager, vm_id)
\ No newline at end of file
+            get_or_create_vm_detail(custom_user, manager, vm_id)
diff --git a/digitalglarus/locale/de/LC_MESSAGES/django.po b/digitalglarus/locale/de/LC_MESSAGES/django.po
index ec96f5dc..ef7a46b5 100644
--- a/digitalglarus/locale/de/LC_MESSAGES/django.po
+++ b/digitalglarus/locale/de/LC_MESSAGES/django.po
@@ -376,8 +376,6 @@ msgid ""
 "                    digitalglarus.ch<br/>\n"
 "                    hack4lgarus.ch<br/>\n"
 "                    ipv6onlyhosting.com<br/>\n"
-"                    ipv6onlyhosting.ch<br/>\n"
-"                    ipv6onlyhosting.net<br/>\n"
 "                    django-hosting.ch<br/>\n"
 "                    rails-hosting.ch<br/>\n"
 "                    node-hosting.ch<br/>\n"
@@ -636,8 +634,8 @@ msgstr ""
 "Internetangebot der ungleich glarus ag, welches unter den nachfolgenden "
 "Domains erreichbar ist:<br/><br/>ungleich.ch<br/>datacenterlight.ch<br/"
 ">devuanhosting.com<br/>devuanhosting.ch<br/>digitalglarus.ch<br/>hack4lgarus."
-"ch<br/>ipv6onlyhosting.com<br/>ipv6onlyhosting.ch<br/>ipv6onlyhosting.net<br/"
-">django-hosting.ch<br/>rails-hosting.ch<br/>node-hosting.ch<br/>blog."
+"ch<br/>ipv6onlyhosting.com<br/>django-hosting.ch<br/>rails-hosting.ch"
+"<br/>node-hosting.ch<br/>blog."
 "ungleich.ch<br/><br/>Der Datenschutzbeauftragte des Verantwortlichen ist:<br/"
 "><br/>Sanghee Kim<br/>ungleich glarus ag<br/>Bahnhofstrasse 1<br/>8783 "
 "Linthal (CH)<br/>E-Mail: <a href=\"mailto:sanghee.kim@ungleich.ch\">sanghee."
@@ -838,3 +836,4 @@ msgstr ""
 
 #~ msgid "index/?$"
 #~ msgstr "index/?$"
+
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 03013ea5..62fe2897 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -631,8 +631,6 @@ GOOGLE_ANALYTICS_PROPERTY_IDS = {
     'datacenterlight.ch': 'UA-62285904-8',
     'devuanhosting.ch': 'UA-62285904-9',
     'devuanhosting.com': 'UA-62285904-9',
-    'ipv6onlyhosting.ch': 'UA-62285904-10',
-    'ipv6onlyhosting.net': 'UA-62285904-10',
     'ipv6onlyhosting.com': 'UA-62285904-10',
     'comic.ungleich.ch': 'UA-62285904-13',
     '127.0.0.1:8000': 'localhost',
diff --git a/dynamicweb/settings/prod.py b/dynamicweb/settings/prod.py
index 445748ad..0590ca27 100644
--- a/dynamicweb/settings/prod.py
+++ b/dynamicweb/settings/prod.py
@@ -28,9 +28,7 @@ ALLOWED_HOSTS = [
     ".devuanhosting.ch",
     ".devuanhosting.com",
     ".digitalezukunft.ch",
-    ".ipv6onlyhosting.ch",
     ".ipv6onlyhosting.com",
-    ".ipv6onlyhosting.net",
     ".digitalglarus.ch",
     ".hack4glarus.ch",
     ".xn--nglarus-n2a.ch"
diff --git a/templates/gdpr/gdpr_banner.html b/templates/gdpr/gdpr_banner.html
index 7e9f5c7f..f927f8ee 100644
--- a/templates/gdpr/gdpr_banner.html
+++ b/templates/gdpr/gdpr_banner.html
@@ -134,8 +134,6 @@
                     digitalglarus.ch<br/>
                     hack4lgarus.ch<br/>
                     ipv6onlyhosting.com<br/>
-                    ipv6onlyhosting.ch<br/>
-                    ipv6onlyhosting.net<br/>
                     django-hosting.ch<br/>
                     rails-hosting.ch<br/>
                     node-hosting.ch<br/>