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
Vincent Bechu
slapos
Commits
c763596c
Commit
c763596c
authored
May 26, 2014
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
abilian: added redis instance
parent
59b5f973
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
58 additions
and
5 deletions
+58
-5
software/abilian/extranet_spr/instance-redis.cfg.in
software/abilian/extranet_spr/instance-redis.cfg.in
+36
-0
software/abilian/extranet_spr/instance.cfg.in
software/abilian/extranet_spr/instance.cfg.in
+14
-5
software/abilian/extranet_spr/software.cfg
software/abilian/extranet_spr/software.cfg
+8
-0
No files found.
software/abilian/extranet_spr/instance-redis.cfg.in
0 → 100644
View file @
c763596c
[buildout]
parts =
publish-redis-connection-parameters
redis
[redis-passwd]
recipe = slapos.cookbook:generate.password
storage-path = $${directories:etc}/.redis-passwd
bytes = 4
[redis]
recipe = slapos.cookbook:redis.server
server_bin = ${redis:location}/bin/redis-server
ipv6 = $${instance-parameters:ipv6-random}
port = 6379
use_passwd = $${slap-parameter:use_passwd}
pid_file = $${directories:run}/redis.pid
server_dir = $${directories:srv}
passwd = $${redis-passwd:passwd}
config_file = $${directories:etc}/redis.conf
log_file = $${directories:log}/redis.log
wrapper = $${directories:services}/redis_server
promise_wrapper = $${directories:promises}/redis
# Send informations to SlapOS Master
[publish-redis-connection-parameters]
recipe = slapos.cookbook:publish
redis_ip = $${redis:ipv6}
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 @
c763596c
[buildout]
[buildout]
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
extends =
extends =
${instance-postgres:output}
${instance-postgres:output}
${instance-extranet:output}
${instance-extranet:output}
${instance-redis:output}
${instance-environment:output}
${instance-environment:output}
parts =
parts =
...
@@ -16,7 +21,9 @@ parts =
...
@@ -16,7 +21,9 @@ parts =
json-configuration
json-configuration
json-extra-configuration
json-extra-configuration
request-web-frontend
request-web-frontend
publish-connection-parameter
publish-connection-parameters
redis
publish-redis-connection-parameters
...
@@ -59,6 +66,8 @@ mode = 0644
...
@@ -59,6 +66,8 @@ mode = 0644
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
bin = $${buildout:directory}/bin
bin = $${buildout:directory}/bin
etc = $${buildout:directory}/etc
etc = $${buildout:directory}/etc
run = $${directories:var}/run
scripts = $${directories:etc}/run
srv = $${buildout:directory}/srv
srv = $${buildout:directory}/srv
services = $${directories:etc}/service
services = $${directories:etc}/service
promises = $${directories:etc}/promise
promises = $${directories:etc}/promise
...
@@ -66,8 +75,8 @@ var = $${buildout:directory}/var
...
@@ -66,8 +75,8 @@ var = $${buildout:directory}/var
extranet_spr-instance = $${:var}/extranet_spr-instance
extranet_spr-instance = $${:var}/extranet_spr-instance
cache = $${:extranet_spr-instance}/cache
cache = $${:extranet_spr-instance}/cache
data = $${:extranet_spr-instance}/data
data = $${:extranet_spr-instance}/data
log = $${
:extranet_spr-instance
}/log
log = $${
directories:var
}/log
tmp = $${
:extranet_spr-instance
}/tmp
tmp = $${
directories:var
}/tmp
whoosh = $${:data}/whoosh
whoosh = $${:data}/whoosh
...
@@ -83,7 +92,7 @@ config-url = https://[$${instance-parameters:ipv6}]:5000/
...
@@ -83,7 +92,7 @@ config-url = https://[$${instance-parameters:ipv6}]:5000/
return = site_url
return = site_url
[publish-connection-parameter]
[publish-connection-parameter
s
]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
url = $${request-web-frontend:connection-site_url}
url = $${request-web-frontend:connection-site_url}
name = test parameter
name = test parameter
software/abilian/extranet_spr/software.cfg
View file @
c763596c
...
@@ -51,6 +51,7 @@ parts =
...
@@ -51,6 +51,7 @@ parts =
nginx
nginx
instance
instance
instance-postgres
instance-postgres
instance-redis
config-staging-py-template
config-staging-py-template
abilian-config
abilian-config
...
@@ -217,6 +218,13 @@ output = ${buildout:directory}/instance-postgres.cfg
...
@@ -217,6 +218,13 @@ output = ${buildout:directory}/instance-postgres.cfg
#XXX md5sum =
#XXX md5sum =
mode = 0644
mode = 0644
[instance-redis]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-redis.cfg.in
output = ${buildout:directory}/instance-redis.cfg
#md5sum =
mode = 0644
[instance-extranet]
[instance-extranet]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-extranet.cfg.in
url = ${:_profile_base_location_}/instance-extranet.cfg.in
...
...
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