Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
107
Merge Requests
107
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
613fb2ca
Commit
613fb2ca
authored
Mar 09, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace all reference to vifib by SlapOS Master.
parent
700abe58
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
slapos/register/register.py
slapos/register/register.py
+11
-11
No files found.
slapos/register/register.py
View file @
613fb2ca
...
...
@@ -67,12 +67,12 @@ class Parser(OptionParser):
default
=
'eth0'
,
type
=
str
),
Option
(
"--master-url"
,
help
=
"URL of
vifib
master"
,
help
=
"URL of
SlapOS
master"
,
default
=
'https://slap.vifib.com'
,
type
=
str
),
Option
(
"--master-url-web"
,
help
=
"URL of
vifib m
aster webservice to register certificates"
,
default
=
'https://www.
vifib.net
'
,
help
=
"URL of
SlapOS M
aster webservice to register certificates"
,
default
=
'https://www.
slapos.org
'
,
type
=
str
),
Option
(
"--partition-number"
,
help
=
"Number of partition on computer"
,
...
...
@@ -87,11 +87,11 @@ class Parser(OptionParser):
default
=
''
,
type
=
str
),
Option
(
"--login"
,
help
=
"User login on
Vifib m
aster webservice"
,
help
=
"User login on
SlapOS M
aster webservice"
,
default
=
None
,
type
=
str
),
Option
(
"--password"
,
help
=
"User password on
Vifib m
aster webservice"
,
help
=
"User password on
SlapOs M
aster webservice"
,
default
=
None
,
type
=
str
),
Option
(
"-t"
,
"--create-tap"
,
...
...
@@ -124,14 +124,14 @@ Partition and attach it to primary interface. Requires primary interface to be \
def
get_login
():
"""Get user id and encode it for basic identification"""
login
=
raw_input
(
"
Vifib
Login: "
)
login
=
raw_input
(
"
SlapOS Master
Login: "
)
password
=
getpass
()
identification
=
base64
.
encodestring
(
'%s:%s'
%
(
login
,
password
))[:
-
1
]
return
identification
def
check_login
(
identification
,
master_url_web
):
"""Check if logged correctly on
vifib
"""
"""Check if logged correctly on
SlapOS Master
"""
request
=
urllib2
.
Request
(
master_url_web
)
# Prepare header for basic authentification
authheader
=
"Basic %s"
%
identification
...
...
@@ -143,7 +143,7 @@ def check_login(identification, master_url_web):
def
get_certificates
(
identification
,
node_name
,
master_url_web
):
"""Download certificates
on vifib m
aster"""
"""Download certificates
from SlapOS M
aster"""
register_server_url
=
'/'
.
join
([
master_url_web
,
(
"add-a-server/WebSection_registerNewComputer?dialog_id=WebSection_viewServerInformationDialog&dialog_method=WebSection_registerNewComputer&title={}&object_path=/erp5/web_site_module/hosting/add-a-server&update_method=&cancel_url=https%3A//www.vifib.net/add-a-server/WebSection_viewServerInformationDialog&Base_callDialogMethod=&field_your_title=Essai1&dialog_category=None&form_id=view"
.
format
(
node_name
))])
request
=
urllib2
.
Request
(
register_server_url
)
# Prepare header for basic authentification
...
...
@@ -155,7 +155,7 @@ def get_certificates(identification, node_name, master_url_web):
def
parse_certificates
(
source
):
"""Parse html gotten from
vifib
to make certificate and key files"""
"""Parse html gotten from
SlapOS Master
to make certificate and key files"""
c_start
=
source
.
find
(
"Certificate:"
)
c_end
=
source
.
find
(
"</textarea>"
,
c_start
)
k_start
=
source
.
find
(
"-----BEGIN PRIVATE KEY-----"
)
...
...
@@ -320,11 +320,11 @@ class Config:
self
.
logger
.
debug
(
"Ipv6 Interface: %s"
%
self
.
ipv6_interface
)
def
register
(
config
):
"""Register new computer on
VIFIB
and generate slapos.cfg"""
"""Register new computer on
SlapOS Master
and generate slapos.cfg"""
# Get User identification and check them
if
config
.
login
==
None
:
while
True
:
print
(
"Please enter your
Vifib
login"
)
print
(
"Please enter your
SlapOS Master
login"
)
user_id
=
get_login
()
if
check_login
(
user_id
,
config
.
master_url_web
):
break
...
...
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