Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
6ed2299d
authored
Feb 21, 2013
by
x
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix release bugs
parent
ac53d429
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
firewall/fw.py
+2
-2
one/views.py
+5
-2
No files found.
firewall/fw.py
View file @
6ed2299d
...
...
@@ -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
View file @
6ed2299d
...
...
@@ -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'
],
}))
...
...
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