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
Roque
slapos
Commits
29303c51
Commit
29303c51
authored
Mar 13, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support for docservers_path parameter
parent
53e9c678
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
software/maarch/instance-custom.cfg.in
software/maarch/instance-custom.cfg.in
+2
-0
software/maarch/software.cfg
software/maarch/software.cfg
+1
-1
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+1
-1
stack/lapp/instance-resilient.cfg.jinja2
stack/lapp/instance-resilient.cfg.jinja2
+4
-2
No files found.
software/maarch/instance-custom.cfg.in
View file @
29303c51
...
@@ -13,6 +13,7 @@ php-ini = $${directory:php-ini-dir}/php.ini
...
@@ -13,6 +13,7 @@ php-ini = $${directory:php-ini-dir}/php.ini
root-docservers = $${buildout:directory}/srv/docservers
root-docservers = $${buildout:directory}/srv/docservers
dependency = $${apache-php:recipe}
dependency = $${apache-php:recipe}
maarch-sql-data-file = $${slap-parameter:maarch-sql-data-file}
maarch-sql-data-file = $${slap-parameter:maarch-sql-data-file}
maarch-docservers-path = $${slap-parameter:maarch-docservers-path}
[publish-connection-informations]
[publish-connection-informations]
# XXX login should not be hardcoded
# XXX login should not be hardcoded
...
@@ -21,4 +22,5 @@ password = $${maarch-configuration:db-password}
...
@@ -21,4 +22,5 @@ password = $${maarch-configuration:db-password}
[slap-parameter]
[slap-parameter]
maarch-sql-data-file =
maarch-sql-data-file =
maarch-docservers-path =
software/maarch/software.cfg
View file @
29303c51
...
@@ -40,7 +40,7 @@ part-list = maarch-configuration
...
@@ -40,7 +40,7 @@ part-list = maarch-configuration
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-custom.cfg.in
url = ${:_profile_base_location_}/instance-custom.cfg.in
output = ${buildout:directory}/instance-custom.cfg
output = ${buildout:directory}/instance-custom.cfg
md5sum =
f86b311d443156e327a1b5f5acfb22b1
md5sum =
ba84bd1b02bf555ab1152a1d74aaf2a7
mode = 0644
mode = 0644
...
...
stack/lapp/buildout.cfg
View file @
29303c51
...
@@ -98,7 +98,7 @@ context = key buildout buildout:bin-directory
...
@@ -98,7 +98,7 @@ context = key buildout buildout:bin-directory
import-list = file parts template-parts:destination
import-list = file parts template-parts:destination
file replicated template-replicated:destination
file replicated template-replicated:destination
md5sum =
16490b8b0807d62826a4350a3b4510c1
md5sum =
a5ff7e8fbd7d14603ec6f4da9226ded8
mode = 0644
mode = 0644
[instance-postgres]
[instance-postgres]
...
...
stack/lapp/instance-resilient.cfg.jinja2
View file @
29303c51
...
@@ -19,7 +19,7 @@ parts +=
...
@@ -19,7 +19,7 @@ parts +=
[request-apache]
[request-apache]
return = url ssh-public-key ssh-url notification-id ip url backend_url
return = url ssh-public-key ssh-url notification-id ip url backend_url
# XXX: hardcoded values
# XXX: hardcoded values
config = domain number authorized-key notify ip-list namebase postgres1-computer-guid pbs-postgres1-computer-guid postgres2-computer-guid pbs-postgres2-computer-guid postgres3-computer-guid pbs-postgres3-computer-guid maarch-sql-data-file
config = domain number authorized-key notify ip-list namebase postgres1-computer-guid pbs-postgres1-computer-guid postgres2-computer-guid pbs-postgres2-computer-guid postgres3-computer-guid pbs-postgres3-computer-guid maarch-sql-data-file
maarch-docservers-path
config-postgres1-computer-guid = ${slap-parameter:postgres1-computer-guid}
config-postgres1-computer-guid = ${slap-parameter:postgres1-computer-guid}
config-pbs-postgres1-computer-guid = ${slap-parameter:pbs-postgres1-computer-guid}
config-pbs-postgres1-computer-guid = ${slap-parameter:pbs-postgres1-computer-guid}
config-postgres2-computer-guid = ${slap-parameter:postgres2-computer-guid}
config-postgres2-computer-guid = ${slap-parameter:postgres2-computer-guid}
...
@@ -28,6 +28,7 @@ config-postgres3-computer-guid = ${slap-parameter:postgres3-computer-guid}
...
@@ -28,6 +28,7 @@ config-postgres3-computer-guid = ${slap-parameter:postgres3-computer-guid}
config-pbs-postgres3-computer-guid = ${slap-parameter:pbs-postgres3-computer-guid}
config-pbs-postgres3-computer-guid = ${slap-parameter:pbs-postgres3-computer-guid}
config-domain = ${slap-parameter:domain}
config-domain = ${slap-parameter:domain}
config-maarch-sql-data-file = ${slap-parameter:maarch-sql-data-file}
config-maarch-sql-data-file = ${slap-parameter:maarch-sql-data-file}
config-maarch-docservers-path = ${slap-parameter:maarch-docservers-path}
[publish-connection-informations]
[publish-connection-informations]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
...
@@ -46,5 +47,6 @@ postgres3-computer-guid =
...
@@ -46,5 +47,6 @@ postgres3-computer-guid =
pbs-postgres3-computer-guid =
pbs-postgres3-computer-guid =
# XXX-Cedric: Hardcoded parameters. Should be dynamically generated.
# XXX-Cedric: Hardcoded parameters. Should be dynamically generated.
domain =
domain =
# the
sql-data-file parameter is
specific to maarch
# the
following parameters are
specific to maarch
maarch-sql-data-file =
maarch-sql-data-file =
maarch-docservers-path =
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