ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Change to dcl-orders for new vm and removing ipv6onlyhosting.{net,ch} references

Browse source
This commit is contained in:
app@dynamicweb-production 2022-03-23 10:46:12 +01:00 committed by app
parent d739a4a50e
commit 95c07fbed1
5 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
datacenterlight/tasks.py
View file

@ -195,7 +195,7 @@ def handle_metadata_and_emails(order_id, vm_id, manager, user, specs,
email_data = { email_data = {
'subject': settings.DCL_TEXT + " Order from %s" % context['email'], 'subject': settings.DCL_TEXT + " Order from %s" % context['email'],
'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
'to': ['info@ungleich.ch'], 'to': ['dcl-orders@ungleich.ch'],
'body': "\n".join( 'body': "\n".join(
["%s=%s" % (k, v) for (k, v) in context.items()]), ["%s=%s" % (k, v) for (k, v) in context.items()]),
'reply_to': [context['email']], '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)) logger.debug("New VM ID is {vm_id}".format(vm_id=vm_id))
if vm_id > 0: if vm_id > 0:
get_or_create_vm_detail(custom_user, manager, vm_id) get_or_create_vm_detail(custom_user, manager, vm_id)

7
digitalglarus/locale/de/LC_MESSAGES/django.po
View file

@ -376,8 +376,6 @@ msgid ""
" digitalglarus.ch<br/>\n" " digitalglarus.ch<br/>\n"
" hack4lgarus.ch<br/>\n" " hack4lgarus.ch<br/>\n"
" ipv6onlyhosting.com<br/>\n" " ipv6onlyhosting.com<br/>\n"
" ipv6onlyhosting.ch<br/>\n"
" ipv6onlyhosting.net<br/>\n"
" django-hosting.ch<br/>\n" " django-hosting.ch<br/>\n"
" rails-hosting.ch<br/>\n" " rails-hosting.ch<br/>\n"
" node-hosting.ch<br/>\n" " node-hosting.ch<br/>\n"
@ -636,8 +634,8 @@ msgstr ""
"Internetangebot der ungleich glarus ag, welches unter den nachfolgenden " "Internetangebot der ungleich glarus ag, welches unter den nachfolgenden "
"Domains erreichbar ist:<br/><br/>ungleich.ch<br/>datacenterlight.ch<br/" "Domains erreichbar ist:<br/><br/>ungleich.ch<br/>datacenterlight.ch<br/"
">devuanhosting.com<br/>devuanhosting.ch<br/>digitalglarus.ch<br/>hack4lgarus." ">devuanhosting.com<br/>devuanhosting.ch<br/>digitalglarus.ch<br/>hack4lgarus."
"ch<br/>ipv6onlyhosting.com<br/>ipv6onlyhosting.ch<br/>ipv6onlyhosting.net<br/" "ch<br/>ipv6onlyhosting.com<br/>django-hosting.ch<br/>rails-hosting.ch"
">django-hosting.ch<br/>rails-hosting.ch<br/>node-hosting.ch<br/>blog." "<br/>node-hosting.ch<br/>blog."
"ungleich.ch<br/><br/>Der Datenschutzbeauftragte des Verantwortlichen ist:<br/" "ungleich.ch<br/><br/>Der Datenschutzbeauftragte des Verantwortlichen ist:<br/"
"><br/>Sanghee Kim<br/>ungleich glarus ag<br/>Bahnhofstrasse 1<br/>8783 " "><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." "Linthal (CH)<br/>E-Mail: <a href=\"mailto:sanghee.kim@ungleich.ch\">sanghee."
@ -838,3 +836,4 @@ msgstr ""
#~ msgid "index/?$" #~ msgid "index/?$"
#~ msgstr "index/?$" #~ msgstr "index/?$"

2
dynamicweb/settings/base.py
View file

@ -631,8 +631,6 @@ GOOGLE_ANALYTICS_PROPERTY_IDS = {
'datacenterlight.ch': 'UA-62285904-8', 'datacenterlight.ch': 'UA-62285904-8',
'devuanhosting.ch': 'UA-62285904-9', 'devuanhosting.ch': 'UA-62285904-9',
'devuanhosting.com': 'UA-62285904-9', 'devuanhosting.com': 'UA-62285904-9',
'ipv6onlyhosting.ch': 'UA-62285904-10',
'ipv6onlyhosting.net': 'UA-62285904-10',
'ipv6onlyhosting.com': 'UA-62285904-10', 'ipv6onlyhosting.com': 'UA-62285904-10',
'comic.ungleich.ch': 'UA-62285904-13', 'comic.ungleich.ch': 'UA-62285904-13',
'127.0.0.1:8000': 'localhost', '127.0.0.1:8000': 'localhost',

2
dynamicweb/settings/prod.py
View file

@ -28,9 +28,7 @@ ALLOWED_HOSTS = [
".devuanhosting.ch", ".devuanhosting.ch",
".devuanhosting.com", ".devuanhosting.com",
".digitalezukunft.ch", ".digitalezukunft.ch",
".ipv6onlyhosting.ch",
".ipv6onlyhosting.com", ".ipv6onlyhosting.com",
".ipv6onlyhosting.net",
".digitalglarus.ch", ".digitalglarus.ch",
".hack4glarus.ch", ".hack4glarus.ch",
".xn--nglarus-n2a.ch" ".xn--nglarus-n2a.ch"

2
templates/gdpr/gdpr_banner.html
View file

@ -134,8 +134,6 @@
digitalglarus.ch<br/> digitalglarus.ch<br/>
hack4lgarus.ch<br/> hack4lgarus.ch<br/>
ipv6onlyhosting.com<br/> ipv6onlyhosting.com<br/>
ipv6onlyhosting.ch<br/>
ipv6onlyhosting.net<br/>
django-hosting.ch<br/> django-hosting.ch<br/>
rails-hosting.ch<br/> rails-hosting.ch<br/>
node-hosting.ch<br/> node-hosting.ch<br/>