-
+
GB RAM
diff --git a/hosting/views.py b/hosting/views.py
index 8a746a56..197a843d 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -41,6 +41,7 @@ from utils.forms import (
from utils.hosting_utils import get_vm_price
from utils.mailer import BaseEmail
from utils.stripe_utils import StripeUtils
+from utils.tasks import send_plain_email_task
from utils.views import (
PasswordResetViewMixin, PasswordResetConfirmViewMixin, LoginViewMixin,
ResendActivationLinkViewMixin
@@ -945,7 +946,7 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View):
raise ValidationError(_('Invalid number of cores'))
def validate_memory(self, value):
- if (value > 200) or (value < 2):
+ if (value > 200) or (value < 1):
raise ValidationError(_('Invalid RAM size'))
def validate_storage(self, value):
@@ -1036,7 +1037,7 @@ class VirtualMachineView(LoginRequiredMixin, View):
)
return None
except Exception as error:
- print(error)
+ logger.error(str(error))
raise Http404()
def get_success_url(self):
@@ -1079,49 +1080,88 @@ class VirtualMachineView(LoginRequiredMixin, View):
def post(self, request, *args, **kwargs):
response = {'status': False}
+ admin_email_body = {}
owner = self.request.user
vm = self.get_object()
- opennebula_vm_id = self.kwargs.get('pk')
-
manager = OpenNebulaManager(
email=owner.email,
password=owner.password
)
-
try:
vm_data = VirtualMachineSerializer(manager.get_vm(vm.id)).data
vm_name = vm_data.get('name')
- except WrongIdError:
+ except WrongIdError as wrong_id_err:
+ logger.error(str(wrong_id_err))
return redirect(reverse('hosting:virtual_machines'))
+ # Cancel Stripe subscription
+ stripe_utils = StripeUtils()
+ try:
+ hosting_order = HostingOrder.objects.get(
+ vm_id=vm.id
+ )
+ result = stripe_utils.unsubscribe_customer(
+ subscription_id=hosting_order.subscription_id
+ )
+ stripe_subscription_obj = result.get('response_object')
+ # Check if the subscription was canceled
+ if (stripe_subscription_obj is None or
+ stripe_subscription_obj.status != 'canceled'):
+ error_msg = result.get('error')
+ logger.error(
+ 'Error canceling subscription for {user} and vm id '
+ '{vm_id}'.format(user=owner.email, vm_id=vm.id)
+ )
+ logger.error(error_msg)
+ admin_email_body['stripe_error_msg'] = error_msg
+ except HostingOrder.DoesNotExist:
+ error_msg = (
+ "HostingOrder corresponding to vm_id={vm_id} does"
+ "not exist. Hence, can not find subscription to "
+ "cancel ".format(vm_id=vm.id)
+ )
+ logger.error(error_msg)
+ admin_email_body['stripe_error_msg'] = error_msg
+
terminated = manager.delete_vm(vm.id)
if not terminated:
- response['text'] = ugettext(
- 'Error terminating VM') + opennebula_vm_id
+ logger.debug(
+ "manager.delete_vm returned False. Hence, error making "
+ "xml-rpc call to delete vm failed."
+ )
+ response['text'] = ugettext('Error terminating VM') + vm.id
else:
for t in range(15):
try:
- manager.get_vm(opennebula_vm_id)
+ manager.get_vm(vm.id)
except WrongIdError:
response['status'] = True
response['text'] = ugettext('Terminated')
vm_detail_obj = VMDetail.objects.filter(
- vm_id=opennebula_vm_id).first()
+ vm_id=vm.id
+ ).first()
vm_detail_obj.terminated_at = datetime.utcnow()
vm_detail_obj.save()
- break
- except BaseException:
+ except BaseException as base_exception:
+ logger.error(
+ "manager.get_vm({vm_id}) returned exception: "
+ "{details}.".format(
+ details=str(base_exception), vm_id=vm.id
+ )
+ )
break
else:
sleep(2)
context = {
'vm_name': vm_name,
- 'base_url': "{0}://{1}".format(self.request.scheme,
- self.request.get_host()),
+ 'base_url': "{0}://{1}".format(
+ self.request.scheme, self.request.get_host()
+ ),
'page_header': _('Virtual Machine %(vm_name)s Cancelled') % {
- 'vm_name': vm_name}
+ 'vm_name': vm_name
+ }
}
email_data = {
'subject': context['page_header'],
@@ -1133,6 +1173,18 @@ class VirtualMachineView(LoginRequiredMixin, View):
}
email = BaseEmail(**email_data)
email.send()
+ admin_email_body.update(response)
+ email_to_admin_data = {
+ 'subject': "Deleted VM and Subscription for VM {vm_id} and "
+ "user: {user}".format(
+ vm_id=vm.id, user=owner.email
+ ),
+ 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
+ 'to': ['info@ungleich.ch'],
+ 'body': "\n".join(
+ ["%s=%s" % (k, v) for (k, v) in admin_email_body.items()]),
+ }
+ send_plain_email_task.delay(email_to_admin_data)
return HttpResponse(
json.dumps(response),
content_type="application/json"
diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po
index 029137b1..9b4ef07b 100644
--- a/ungleich_page/locale/de/LC_MESSAGES/django.po
+++ b/ungleich_page/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 01:00+0530\n"
+"POT-Creation-Date: 2017-12-23 05:18+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME Your Linux Infrastructure " -msgstr "Wir designen, erstellen und warten
Ihre Linux-Infrastruktur" +msgid "Hosting" +msgstr "Hosting" + +msgid "" +"Ruby on Rails. Java hosting, Django hosting, we make it everything run " +"smooth and safe." +msgstr "" +"Ruby on Rails. Java hosting, Django hosting, wir garantieren einen " +"reibungslosen Ablauf." + +msgid "Configuration as a Service" +msgstr "Konfiguration als Service" + +msgid "" +"Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that " +"needs to configured, we provide comprehensive solutions. Amazon, rackspace " +"or bare metal servers, we configure for you." +msgstr "" +"Ruby on Rails, Django, Java, Webserver, Mailserver, jegliche Infrastruktur " +"welche eine Konfiguration braucht, wir offerieren umfassende Lösungen, " +"Amazon, Rackspace oder Bare Metal Servers, wir konfigurieren alles." + +msgid "Linux System Engineering" +msgstr "Linux System Engineering" + +msgid "" +"Let your developers develop! We take care of your system administration. " +"Gentoo, Archlinux, Debian, Ubuntu, and many more." +msgstr "" +"Lassen sie ihre Entwickler entwickeln! Wir kümmern uns um ihre " +"Systemadministration. Gentoo, Archlinux, Debian, Ubuntu und viele mehr." msgid "Our Products" msgstr "Unsere Produkte" @@ -216,38 +245,6 @@ msgstr "" "Unser erstklassiges Konfigurationsmanagement ist erfrischend einfach und " "zuverlässig." -msgid "Hosting" -msgstr "Hosting" - -msgid "" -"Ruby on Rails. Java hosting, Django hosting, we make it everything run " -"smooth and safe." -msgstr "" -"Ruby on Rails. Java hosting, Django hosting, wir garantieren einen " -"reibungslosen Ablauf" - -msgid "Configuration as a Service" -msgstr "Konfiguration als Service" - -msgid "" -"Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that " -"needs to configured, we provide comprehensive solutions. Amazon, rackspace " -"or bare metal servers, we configure for you." -msgstr "" -"Ruby on Rails, Django, Java, Webserver, Mailserver, jegliche Infrastruktur " -"welche eine Konfiguration braucht, wir offerieren umfassende Lösungen, " -"Amazon, Rackspace oder Bare Metal Servers, wir konfigurieren alles." - -msgid "Linux System Engineering" -msgstr "Linux System Engineering" - -msgid "" -"Let your developers develop! We take care of your system administration. " -"Gentoo, Archlinux, Debian, Ubuntu, and many more." -msgstr "" -"Lassen sie ihre Entwickler entwickeln! Wir kümmern uns um ihre " -"Systemadministration. Gentoo, Archlinux, Debian, Ubuntu und viele mehr." - msgid "Why ungleich?*" msgstr "Warum ungleich?" @@ -363,6 +360,9 @@ msgid "If you have any question, just send us an email." msgstr "" "Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail." +#~ msgid "We Design, Configure & Maintain
Your Linux Infrastructure " +#~ msgstr "Wir designen, erstellen und warten
Ihre Linux-Infrastruktur" + #~ msgid "Hosting Products " #~ msgstr "Hosting Produkte" diff --git a/ungleich_page/migrations/0017_auto_20171219_1856.py b/ungleich_page/migrations/0017_auto_20171219_1856.py index 14c137a9..f5d76c50 100644 --- a/ungleich_page/migrations/0017_auto_20171219_1856.py +++ b/ungleich_page/migrations/0017_auto_20171219_1856.py @@ -30,7 +30,7 @@ class Migration(migrations.Migration): blank=True, help_text='Text for the button, if a link is provided.', max_length=50, null=True)), ('heading', models.CharField( blank=True, help_text='An optional title for this slide.', max_length=100, null=True)), - ('video', filer.fields.file.FilerFileField(blank=True, help_text='Leavig this blank will make the image as the background.', + ('video', filer.fields.file.FilerFileField(blank=True, help_text='Leaving this blank will make the image as the background.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ungleich_header_item_video', to='filer.File')), ], options={ diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index eca4036b..43a05898 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -372,7 +372,7 @@ section h3.section-subheading { @media(min-width:768px) { section { - padding: 125px 0; + padding: 80px 0; } section h2.section-heading { font-size: 40px; @@ -985,4 +985,4 @@ section h3.section-comment { .carousel-author { height: 72px; } -} \ No newline at end of file +} diff --git a/ungleich_page/templates/ungleich_page/glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser.html index 6bcb0746..3d8fbb76 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser.html +++ b/ungleich_page/templates/ungleich_page/glasfaser.html @@ -220,11 +220,11 @@
-
ungleich GmbH
+ungleich glarus ag
glasfaser@ungleich.ch
-In der Au 7, Schwanden 8762
+Bahnhofstrasse 1, 8783 Linthal
Switzerland
{% trans "The first incarnation of ungleich" %}
-{% trans "in Germany" %}
+{% trans "in Germany." %}
{% trans "ungleich founded" %}
-{% trans "in Switzerland" %}
+{% trans "in Switzerland." %}
2014
-
@@ -62,7 +62,7 @@
{% trans "ungleich present at various conferences" %}:
Linuxtag, UCMS, Linux Erfa, ETH Zurich
+
{% trans "ungleich present at various conferences" %}:
Linuxtag, UCMS, Linux Erfa, ETH Zurich.
{% trans "and introduces affordable 24X7 support." %}
{% trans "ungleich launches" %} - {% trans "Digital Glarus project" %} + {% trans "Digital Glarus project" %}.
@@ -93,19 +93,6 @@ -
- 
-
-
-
- 
@@ -115,6 +102,7 @@
2017
+
diff --git a/ungleich_page/templates/ungleich_page/includes/_header.html b/ungleich_page/templates/ungleich_page/includes/_header.html
index 4819ec1e..04bbce5d 100644
--- a/ungleich_page/templates/ungleich_page/includes/_header.html
+++ b/ungleich_page/templates/ungleich_page/includes/_header.html
@@ -18,11 +18,8 @@
{% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich".' %}
{% blocktrans %}ungleich sells Alplora to an IoT startup in canton Zürich.{% endblocktrans %}
{% trans "ungleich showcases the most affordable Swiss VM hosting, Data Center Light." %}
-
- {% trans "We Design, Configure & Maintain
Your Linux Infrastructure " %} -
- Your Linux Infrastructure " %} -
Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you.
- Learn More +{% trans "Hosting" %}
+ {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}
@@ -33,11 +30,9 @@
-
- {% trans "We Design, Configure & Maintain
Your Linux Infrastructure " %} -
- Your Linux Infrastructure " %} -
Ruby on Rails, Django, Nothing else.
- Learn More +{% trans "Configuration as a Service" %}
+ {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}
+
@@ -47,10 +42,8 @@
-
diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py
index 8fcf0ab1..58840be0 100644
--- a/utils/stripe_utils.py
+++ b/utils/stripe_utils.py
@@ -232,6 +232,17 @@ class StripeUtils(object):
)
return subscription_result
+ @handleStripeError
+ def unsubscribe_customer(self, subscription_id):
+ """
+ Cancels a given subscription
+
+ :param subscription_id: The Stripe subscription id string
+ :return:
+ """
+ sub = stripe.Subscription.retrieve(subscription_id)
+ return sub.delete()
+
@handleStripeError
def make_payment(self, customer, amount, token):
charge = self.stripe.Charge.create(
- {% trans "We Design, Configure & Maintain
Your Linux Infrastructure " %} -
- Learn More
+ Your Linux Infrastructure " %} -
{% trans "Linux System Engineering" %}
+ {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}