Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
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
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
0cddc1de
authored
Mar 18, 2013
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #87
parent
04d51cf0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
one/models.py
+2
-1
No files found.
one/models.py
View file @
0cddc1de
...
@@ -18,6 +18,7 @@ from firewall.models import Host, Rule, Vlan, Record
...
@@ -18,6 +18,7 @@ from firewall.models import Host, Rule, Vlan, Record
from
school.models
import
Person
,
Group
from
school.models
import
Person
,
Group
from
store.api
import
StoreApi
from
store.api
import
StoreApi
from
.util
import
keygen
from
.util
import
keygen
from
cloud.settings
import
CLOUD_URL
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
pwgen
=
User
.
objects
.
make_random_password
pwgen
=
User
.
objects
.
make_random_password
...
@@ -530,7 +531,7 @@ class Instance(models.Model):
...
@@ -530,7 +531,7 @@ class Instance(models.Model):
"smbpw"
:
escape
(
details
.
smb_password
),
"smbpw"
:
escape
(
details
.
smb_password
),
"sshkey"
:
escape
(
details
.
ssh_private_key
),
"sshkey"
:
escape
(
details
.
ssh_private_key
),
"neptun"
:
escape
(
owner
.
username
),
"neptun"
:
escape
(
owner
.
username
),
"booturl"
:
"
https://cloud.ik.bme.hu/b/
%
s/"
%
token
,
"booturl"
:
"
%
sb/
%
s/"
%
(
CLOUD_URL
,
token
)
,
"extra"
:
extra
}
"extra"
:
extra
}
f
.
write
(
tpl
)
f
.
write
(
tpl
)
f
.
close
()
f
.
close
()
...
...
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