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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
8e0bf158
Commit
8e0bf158
authored
Jun 06, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
memcached : (hopefully) working set
parent
7c8c9ee1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
14 deletions
+15
-14
slapos/recipe/memcached/__init__.py
slapos/recipe/memcached/__init__.py
+12
-9
slapos/recipe/memcached/template/stunnel.conf.in
slapos/recipe/memcached/template/stunnel.conf.in
+3
-5
No files found.
slapos/recipe/memcached/__init__.py
View file @
8e0bf158
...
@@ -53,11 +53,15 @@ class Recipe(BaseSlapRecipe):
...
@@ -53,11 +53,15 @@ class Recipe(BaseSlapRecipe):
certificate
,
key
,
ca_conf
[
'ca_crl'
],
certificate
,
key
,
ca_conf
[
'ca_crl'
],
ca_conf
[
'certificate_authority_path'
])
ca_conf
[
'certificate_authority_path'
])
stunnel_conf
=
self
.
installStunnel
(
self
.
getGlobalIPv6Address
(),
self
.
getLocalIPv4Address
(),
12345
,
kumo_conf
[
'kumo_gateway_port'
],
certificate
,
key
,
ca_conf
[
'ca_crl'
],
ca_conf
[
'certificate_authority_path'
])
self
.
linkBinary
()
self
.
linkBinary
()
self
.
setConnectionDict
(
dict
(
self
.
setConnectionDict
(
dict
(
memcached_ip
=
memcached_conf
[
'memcached_ip'
],
stunnel_ip
=
stunnel_conf
[
'public_ip'
],
memcached_port
=
memcached_conf
[
'memcached_port'
],
stunnel_port
=
stunnel_conf
[
'public_port'
],
stunnel_ip
=
stunnel_conf
[
'port'
],
))
))
return
self
.
path_list
return
self
.
path_list
...
@@ -199,23 +203,23 @@ class Recipe(BaseSlapRecipe):
...
@@ -199,23 +203,23 @@ class Recipe(BaseSlapRecipe):
parser
.
write
(
open
(
os
.
path
.
join
(
self
.
ca_request_dir
,
hash
),
'w'
))
parser
.
write
(
open
(
os
.
path
.
join
(
self
.
ca_request_dir
,
hash
),
'w'
))
return
key
,
certificate
return
key
,
certificate
def
installStunnel
(
self
,
ip
,
port
,
external
_port
,
def
installStunnel
(
self
,
public_ip
,
private_ip
,
public_port
,
private
_port
,
ca_certificate
,
key
,
ca_crl
,
ca_path
):
ca_certificate
,
key
,
ca_crl
,
ca_path
):
"""Installs stunnel"""
"""Installs stunnel"""
template_filename
=
self
.
getTemplateFilename
(
'stunnel.conf.in'
)
template_filename
=
self
.
getTemplateFilename
(
'stunnel.conf.in'
)
log
=
os
.
path
.
join
(
self
.
log_directory
,
'stunnel.log'
)
log
=
os
.
path
.
join
(
self
.
log_directory
,
'stunnel.log'
)
pid_file
=
os
.
path
.
join
(
self
.
run_directory
,
'stunnel.pid'
)
pid_file
=
os
.
path
.
join
(
self
.
run_directory
,
'stunnel.pid'
)
stunnel_conf
=
dict
(
stunnel_conf
=
dict
(
ipv6
=
ip
,
public_ip
=
public_
ip
,
ipv4
=
self
.
getLocalIPv4Address
,
private_ip
=
private_ip
,
p
ort
=
port
,
p
ublic_port
=
public_
port
,
pid_file
=
pid_file
,
pid_file
=
pid_file
,
log
=
log
,
log
=
log
,
cert
=
ca_certificate
,
cert
=
ca_certificate
,
key
=
key
,
key
=
key
,
ca_crl
=
ca_crl
,
ca_crl
=
ca_crl
,
ca_path
=
ca_path
,
ca_path
=
ca_path
,
external_port
=
external
_port
,
private_port
=
private
_port
,
)
)
stunnel_conf_path
=
self
.
createConfigurationFile
(
"stunnel.conf"
,
stunnel_conf_path
=
self
.
createConfigurationFile
(
"stunnel.conf"
,
self
.
substituteTemplate
(
template_filename
,
self
.
substituteTemplate
(
template_filename
,
...
@@ -226,7 +230,6 @@ class Recipe(BaseSlapRecipe):
...
@@ -226,7 +230,6 @@ class Recipe(BaseSlapRecipe):
self
.
options
[
'stunnel_binary'
].
strip
(),
stunnel_conf_path
]
self
.
options
[
'stunnel_binary'
].
strip
(),
stunnel_conf_path
]
)[
0
]
)[
0
]
self
.
path_list
.
append
(
wrapper
)
self
.
path_list
.
append
(
wrapper
)
return
stunnel_conf
return
stunnel_conf
def
installMemcached
(
self
,
ip
,
port
):
def
installMemcached
(
self
,
ip
,
port
):
...
...
slapos/recipe/memcached/template/stunnel.conf.in
View file @
8e0bf158
...
@@ -2,13 +2,11 @@ foreground = yes
...
@@ -2,13 +2,11 @@ foreground = yes
output = %(log)s
output = %(log)s
pid = %(pid_file)s
pid = %(pid_file)s
syslog = no
syslog = no
;accept = %(ip)s%(port)s
CApath = %(ca_path)s
CApath = %(ca_path)s
key = %(key)s
key = %(key)s
CRLpath = %(ca_crl)s
CRLpath = %(ca_crl)s
cert = %(cert)s
cert = %(cert)s
;key = /etc/ssl/certs/stunnel.pem
[
mysqls
]
[
service
]
accept = %(
ipv6)s:%(
port)s
accept = %(
public_ip)s:%(public_
port)s
connect = %(
ipv4)s:%(external
_port)s
connect = %(
private_ip)s:%(private
_port)s
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