fix release bugs

firewall/fw.py

@@ -450,8 +450,8 @@ def dhcp():
                     'router': i_vlan.ipv4,
                     'ntp': i_vlan.ipv4,
                     'dnsserver': settings['rdns_ip'],
-                    'extra': "range %s" % (i_vlan.dhcp_pool
-                        if m else "deny unknown clients"),
+                    'extra': ("range %s" % i_vlan.dhcp_pool
+                        if m else "deny unknown-clients"),
                     'interface': i_vlan.interface,
                     'name': i_vlan.name,
                     'tftp': i_vlan.ipv4

one/views.py

@@ -47,7 +47,10 @@ def home(request):
     except UserCloudDetails.DoesNotExist:
         details = UserCloudDetails(user=request.user)
         details.save()
-    generated_public_key = details.ssh_key
+    try:
+        generated_public_key = details.ssh_key.id
+    except:
+        generated_public_key = -1
     return render_to_response("home.html", RequestContext(request, {
         'shares': shares,
         'templates': Template.objects.filter(state='READY'),
@@ -56,7 +59,7 @@ def home(request):
         'groups': request.user.person_set.all()[0].owned_groups.all(),
         'semesters': Semester.objects.all(),
         'userdetails': details,
-        'keys': request.user.sshkey_set.exclude(id=generated_public_key.id).all(),
+        'keys': request.user.sshkey_set.exclude(id=generated_public_key).all(),
         'storeserv': store_settings['store_public'],
         }))