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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
slapos
Commits
25727e97
Commit
25727e97
authored
Jun 09, 2014
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
abilian/redis recipe: separate options for masterauth and requirepass
the one we want to use is 'requirepass'
parent
12a09f19
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
43 additions
and
31 deletions
+43
-31
slapos/recipe/redis/__init__.py
slapos/recipe/redis/__init__.py
+21
-4
slapos/recipe/redis/promise.py
slapos/recipe/redis/promise.py
+9
-4
slapos/recipe/redis/template/redis.conf.in
slapos/recipe/redis/template/redis.conf.in
+3
-3
software/abilian/extranet_spr/instance-redis.cfg.in
software/abilian/extranet_spr/instance-redis.cfg.in
+6
-9
software/abilian/extranet_spr/instance.cfg.in
software/abilian/extranet_spr/instance.cfg.in
+2
-2
software/abilian/extranet_spr/software.cfg
software/abilian/extranet_spr/software.cfg
+2
-9
No files found.
slapos/recipe/redis/__init__.py
View file @
25727e97
...
@@ -33,17 +33,30 @@ class Recipe(GenericBaseRecipe):
...
@@ -33,17 +33,30 @@ class Recipe(GenericBaseRecipe):
def
install
(
self
):
def
install
(
self
):
path_list
=
[]
path_list
=
[]
# XXX use_passwd and passwd should be deprecated, they have confusing names.
if
not
self
.
optionIsTrue
(
'use_passwd'
,
False
):
if
not
self
.
optionIsTrue
(
'use_passwd'
,
False
):
master
_passwd
=
"# masterauth <master-password>"
master
auth
=
"# masterauth <master-password>"
else
:
else
:
master_passwd
=
"masterauth %s"
%
self
.
options
[
'passwd'
]
masterauth
=
"masterauth %s"
%
self
.
options
[
'passwd'
]
if
self
.
options
.
get
(
'masterauth'
):
masterauth
=
"masterauth %s"
%
self
.
options
[
'masterauth'
]
else
:
masterauth
=
"# masterauth <master-password>"
if
self
.
options
.
get
(
'requirepass'
):
requirepass
=
"requirepass %s"
%
self
.
options
[
'requirepass'
]
else
:
requirepass
=
"# requirepass foobared"
config_file
=
self
.
options
[
'config_file'
].
strip
()
config_file
=
self
.
options
[
'config_file'
].
strip
()
configuration
=
dict
(
pid_file
=
self
.
options
[
'pid_file'
],
configuration
=
dict
(
pid_file
=
self
.
options
[
'pid_file'
],
port
=
self
.
options
[
'port'
],
port
=
self
.
options
[
'port'
],
ipv6
=
self
.
options
[
'ipv6'
],
ipv6
=
self
.
options
[
'ipv6'
],
server_dir
=
self
.
options
[
'server_dir'
],
server_dir
=
self
.
options
[
'server_dir'
],
log_file
=
self
.
options
[
'log_file'
],
log_file
=
self
.
options
[
'log_file'
],
master_passwd
=
master_passwd
masterauth
=
masterauth
,
requirepass
=
requirepass
)
)
config
=
self
.
createFile
(
config_file
,
config
=
self
.
createFile
(
config_file
,
...
@@ -63,7 +76,11 @@ class Recipe(GenericBaseRecipe):
...
@@ -63,7 +76,11 @@ class Recipe(GenericBaseRecipe):
promise
=
self
.
createPythonScript
(
promise
=
self
.
createPythonScript
(
promise_script
,
promise_script
,
'%s.promise.main'
%
__name__
,
'%s.promise.main'
%
__name__
,
dict
(
host
=
self
.
options
[
'ipv6'
],
port
=
self
.
options
[
'port'
])
{
'host'
:
self
.
options
[
'ipv6'
],
'port'
:
self
.
options
[
'port'
],
'requirepass_file'
:
self
.
options
.
get
(
'promise_requirepass_file'
)
}
)
)
path_list
.
append
(
promise
)
path_list
.
append
(
promise
)
...
...
slapos/recipe/redis/promise.py
View file @
25727e97
...
@@ -7,12 +7,17 @@ import sys
...
@@ -7,12 +7,17 @@ import sys
def
main
(
args
):
def
main
(
args
):
host
=
args
[
'host'
]
host
=
args
[
'host'
]
port
=
int
(
args
[
'port'
])
port
=
int
(
args
[
'port'
])
password
=
None
try
:
try
:
pool
=
redis
.
ConnectionPool
(
host
=
host
,
port
=
port
,
db
=
0
)
# use a passfile, we don't store it cleartext on the recipe
if
'requirepass_file'
in
args
:
with
open
(
args
[
'requirepass_file'
])
as
fin
:
password
=
fin
.
read
()
pool
=
redis
.
ConnectionPool
(
host
=
host
,
port
=
port
,
db
=
0
,
password
=
password
)
r
=
redis
.
Redis
(
connection_pool
=
pool
)
r
=
redis
.
Redis
(
connection_pool
=
pool
)
r
.
publish
(
"Promise-Service"
,
"SlapOS Promise"
)
r
.
publish
(
'Promise-Service'
,
'SlapOS Promise'
)
pool
.
disconnect
()
pool
.
disconnect
()
sys
.
exit
(
0
)
sys
.
exit
(
0
)
except
Exception
,
e
:
except
Exception
as
e
:
print
str
(
e
)
print
str
(
e
)
sys
.
exit
(
1
)
sys
.
exit
(
1
)
slapos/recipe/redis/template/redis.conf.in
View file @
25727e97
...
@@ -153,7 +153,7 @@ dir %(server_dir)s
...
@@ -153,7 +153,7 @@ dir %(server_dir)s
# starting the replication synchronization process, otherwise the master will
# starting the replication synchronization process, otherwise the master will
# refuse the slave request.
# refuse the slave request.
#
#
%(master
_passwd
)s
%(master
auth
)s
# When a slave lost the connection with the master, or when the replication
# When a slave lost the connection with the master, or when the replication
# is still in progress, the slave can act in two different ways:
# is still in progress, the slave can act in two different ways:
...
@@ -212,7 +212,7 @@ slave-read-only yes
...
@@ -212,7 +212,7 @@ slave-read-only yes
# 150k passwords per second against a good box. This means that you should
# 150k passwords per second against a good box. This means that you should
# use a very strong password otherwise it will be very easy to break.
# use a very strong password otherwise it will be very easy to break.
#
#
# requirepass foobared
%(requirepass)s
# Command renaming.
# Command renaming.
#
#
...
...
software/abilian/extranet_spr/instance-redis.cfg.in
View file @
25727e97
...
@@ -5,32 +5,29 @@ parts =
...
@@ -5,32 +5,29 @@ parts =
redis
redis
[redis-
passwd
]
[redis-
requirepass
]
recipe = slapos.cookbook:generate.password
recipe = slapos.cookbook:generate.password
storage-path = $${directories:etc}/redis_
passwd
storage-path = $${directories:etc}/redis_
requirepass
bytes = 16
bytes = 16
[redis]
[redis]
recipe = slapos.cookbook:redis.server
recipe = slapos.cookbook:redis.server
server_bin = ${redis:location}/bin/redis-server
server_bin = ${redis:location}/bin/redis-server
ipv6 = $${instance-parameters:ipv6-random}
ipv6 = $${instance-parameters:ipv6-random}
port = 6379
port = 6379
use_passwd = $${slap-parameter:use_passwd}
pid_file = $${directories:run}/redis.pid
pid_file = $${directories:run}/redis.pid
server_dir = $${directories:srv}
server_dir = $${directories:srv}
passwd = $${redis-passwd
:passwd}
requirepass = $${redis-requirepass
:passwd}
config_file = $${directories:etc}/redis.conf
config_file = $${directories:etc}/redis.conf
log_file = $${directories:log}/redis.log
log_file = $${directories:log}/redis.log
wrapper = $${directories:services}/redis_server
wrapper = $${directories:services}/redis_server
promise_wrapper = $${directories:promises}/redis
promise_wrapper = $${directories:promises}/redis
promise_requirepass_file = $${redis-requirepass:storage-path}
## Send informations to SlapOS Master
## Send informations to SlapOS Master
#[publish-redis-connection-parameters]
#[publish-redis-connection-parameters]
#recipe = slapos.cookbook:publish
#recipe = slapos.cookbook:publish
#redis_ip = $${redis:ipv6}
#redis_ip = $${redis:ipv6}
#redis_port = $${redis:port}
#redis_port = $${redis:port}
#redis_passwd = $${redis:passwd}
#redis_uses_password = $${redis:use_passwd}
[slap-parameter]
use_passwd = false
software/abilian/extranet_spr/instance.cfg.in
View file @
25727e97
...
@@ -43,8 +43,8 @@ cert = $${slap-connection:cert-file}
...
@@ -43,8 +43,8 @@ cert = $${slap-connection:cert-file}
recipe = slapos.cookbook:jsondump
recipe = slapos.cookbook:jsondump
json-output = $${buildout:directory}/abilian-config-extra.json
json-output = $${buildout:directory}/abilian-config-extra.json
UNOCONV_LOCATION = ${unoconv-repository:location}/unoconv
UNOCONV_LOCATION = ${unoconv-repository:location}/unoconv
BROKER_URL = redis://[$${redis:ipv6}]:$${redis:port}/2
BROKER_URL = redis://
:$${redis-requirepass:passwd}@
[$${redis:ipv6}]:$${redis:port}/2
CELERY_RESULT_BACKEND = redis://[$${redis:ipv6}]:$${redis:port}/2
CELERY_RESULT_BACKEND = redis://
:$${redis-requirepass:passwd}@
[$${redis:ipv6}]:$${redis:port}/2
SECRET_KEY = $${csrf-secret-key:passwd}
SECRET_KEY = $${csrf-secret-key:passwd}
...
...
software/abilian/extranet_spr/software.cfg
View file @
25727e97
...
@@ -213,13 +213,6 @@ configure-command =
...
@@ -213,13 +213,6 @@ configure-command =
-Dusethreads
-Dusethreads
# TODO must set UNO_PATH={libreoffice-bin:location}/program to run 'unoconv'
#----------------
#----------------
#-- Instance-level buildout profiles.
#-- Instance-level buildout profiles.
...
@@ -227,7 +220,7 @@ configure-command =
...
@@ -227,7 +220,7 @@ configure-command =
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
output = ${buildout:directory}/instance.cfg
md5sum = e
152c7bd8eef50a4e6c3f01ed0c2af31
md5sum = e
6147118f7d297ad9cefe9d81f96da64
mode = 0644
mode = 0644
[instance-postgres]
[instance-postgres]
...
@@ -241,7 +234,7 @@ mode = 0644
...
@@ -241,7 +234,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-redis.cfg.in
url = ${:_profile_base_location_}/instance-redis.cfg.in
output = ${buildout:directory}/instance-redis.cfg
output = ${buildout:directory}/instance-redis.cfg
md5sum = c
cb186134bca3ff626b489bacccae610
md5sum = c
b8dfefa0776de51449ada06c16c38b9
mode = 0644
mode = 0644
[instance-extranet]
[instance-extranet]
...
...
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