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
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
80902f73
authored
Feb 21, 2013
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
one: exclude generated ssh keys from list
parent
c408641b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
cloud/settings.py
+1
-0
one/views.py
+3
-1
No files found.
cloud/settings.py
View file @
80902f73
...
@@ -197,6 +197,7 @@ store_settings = {
...
@@ -197,6 +197,7 @@ store_settings = {
"store_client_key"
:
"/opt/webadmin/cloud/client.key"
,
"store_client_key"
:
"/opt/webadmin/cloud/client.key"
,
"store_client_cert"
:
"/opt/webadmin/cloud/client.crt"
,
"store_client_cert"
:
"/opt/webadmin/cloud/client.crt"
,
"store_url"
:
"http://localhost:9000"
,
"store_url"
:
"http://localhost:9000"
,
"store_public"
:
"store.ik.bme.hu"
,
}
}
...
...
one/views.py
View file @
80902f73
...
@@ -20,6 +20,7 @@ from django.utils.translation import ugettext_lazy as _
...
@@ -20,6 +20,7 @@ from django.utils.translation import ugettext_lazy as _
from
django.views.decorators.http
import
*
from
django.views.decorators.http
import
*
from
django.views.generic
import
*
from
django.views.generic
import
*
from
firewall.tasks
import
*
from
firewall.tasks
import
*
from
cloud.settings
import
store_settings
from
one.models
import
*
from
one.models
import
*
from
school.models
import
*
from
school.models
import
*
import
django.contrib.auth
as
auth
import
django.contrib.auth
as
auth
...
@@ -55,7 +56,8 @@ def home(request):
...
@@ -55,7 +56,8 @@ def home(request):
'groups'
:
request
.
user
.
person_set
.
all
()[
0
]
.
owned_groups
.
all
(),
'groups'
:
request
.
user
.
person_set
.
all
()[
0
]
.
owned_groups
.
all
(),
'semesters'
:
Semester
.
objects
.
all
(),
'semesters'
:
Semester
.
objects
.
all
(),
'userdetails'
:
details
,
'userdetails'
:
details
,
'keys'
:
request
.
user
.
sshkey_set
.
exclude
(
id
=
generated_public_key
.
id
)
.
all
()
'keys'
:
request
.
user
.
sshkey_set
.
exclude
(
id
=
generated_public_key
.
id
)
.
all
(),
'storeserv'
:
store_settings
[
'store_public'
],
}))
}))
@login_required
@login_required
...
...
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