Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d0ae883e
authored
Jun 13, 2013
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
firewall, one: random fixes
parent
a0658ef3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
16 deletions
+21
-16
.gitignore
+3
-0
Makefile
+1
-0
firewall/fw.py
+0
-2
one/models.py
+17
-14
No files found.
.gitignore
View file @
d0ae883e
...
...
@@ -51,3 +51,6 @@ client.crt
client.key
miscellaneous/store-server/store.config
celerybeat-schedule
celerybeat.pid
Makefile
View file @
d0ae883e
...
...
@@ -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
...
...
firewall/fw.py
View file @
d0ae883e
...
...
@@ -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
()
...
...
one/models.py
View file @
d0ae883e
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment