Commit d0ae883e by Bach Dániel

firewall, one: random fixes

parent a0658ef3
......@@ -51,3 +51,6 @@ client.crt
client.key
miscellaneous/store-server/store.config
celerybeat-schedule
celerybeat.pid
......@@ -15,6 +15,7 @@ po:
for i in */; do cd $$i; ../manage.py makemessages --all -d djangojs || true; cd ..; done
migrate:
./manage.py syncdb || true
./manage.py migrate
generatestatic: $(jsfiles) one/static/style/style.css
......
......@@ -17,7 +17,6 @@ class Firewall:
RULES = None
RULES_NAT = []
vlans = None
dmz = None
pub = None
hosts = None
fw = None
......@@ -269,7 +268,6 @@ class Firewall:
self.IPV6 = IPV6
self.vlans = models.Vlan.objects.all()
self.hosts = models.Host.objects.all()
self.dmz = models.Vlan.objects.get(name='DMZ')
self.pub = models.Vlan.objects.get(name='PUB')
self.fw = models.Firewall.objects.all()
self.ipt_filter()
......
......@@ -101,20 +101,23 @@ class UserCloudDetails(models.Model):
def set_quota(sender, instance, created, **kwargs):
if not StoreApi.userexist(instance.user.username):
try:
password = instance.smb_password
quota = instance.disk_quota * 1024
key_list = [key.key for key in instance.user.sshkey_set.all()]
except:
pass
# Create user
if not StoreApi.createuser(instance.user.username, password,
key_list, quota):
pass
else:
StoreApi.set_quota(instance.user.username,
instance.disk_quota * 1024)
try:
if not StoreApi.userexist(instance.user.username):
try:
password = instance.smb_password
quota = instance.disk_quota * 1024
key_list = [key.key for key in instance.user.sshkey_set.all()]
except:
pass
# Create user
if not StoreApi.createuser(instance.user.username, password,
key_list, quota):
pass
else:
StoreApi.set_quota(instance.user.username,
instance.disk_quota * 1024)
except:
pass
post_save.connect(set_quota, sender=UserCloudDetails)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment