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
Eric Zheng
slapos
Commits
adeeb6ad
Commit
adeeb6ad
authored
Mar 12, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support for sql-data-file parameter
parent
3b95904f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
software/maarch/instance-custom.cfg.in
software/maarch/instance-custom.cfg.in
+5
-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
-1
No files found.
software/maarch/instance-custom.cfg.in
View file @
adeeb6ad
...
@@ -12,8 +12,13 @@ language = en
...
@@ -12,8 +12,13 @@ language = en
php_ini = $${directory:php-ini-dir}/php.ini
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}
sql-data-file = $${slap-parameter:sql-data-file}
[publish-connection-informations]
[publish-connection-informations]
# XXX login should not be hardcoded
# XXX login should not be hardcoded
login = superadmin
login = superadmin
password = $${maarch-configuration:db_password}
password = $${maarch-configuration:db_password}
[slap-parameter]
sql-data-file =
software/maarch/software.cfg
View file @
adeeb6ad
...
@@ -63,7 +63,7 @@ part-list = maarch-configuration
...
@@ -63,7 +63,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 =
d1b02a8c571886a225f2f1c8da06286c
md5sum =
2b5888a29f3bfccb76c192e4a9f17c5b
mode = 0644
mode = 0644
...
...
stack/lapp/buildout.cfg
View file @
adeeb6ad
...
@@ -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 =
2eaa5130bf822c4a992462861626cf01
md5sum =
06c682f39f6487bc6e944c5b047bc657
mode = 0644
mode = 0644
[instance-postgres]
[instance-postgres]
...
...
stack/lapp/instance-resilient.cfg.jinja2
View file @
adeeb6ad
...
@@ -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
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
sql-data-file
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}
...
@@ -27,6 +27,7 @@ config-pbs-postgres2-computer-guid = ${slap-parameter:pbs-postgres2-computer-gui
...
@@ -27,6 +27,7 @@ config-pbs-postgres2-computer-guid = ${slap-parameter:pbs-postgres2-computer-gui
config-postgres3-computer-guid = ${slap-parameter:postgres3-computer-guid}
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-sql-data-file = ${slap-parameter:sql-data-file}
[publish-connection-informations]
[publish-connection-informations]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
...
@@ -45,3 +46,5 @@ postgres3-computer-guid =
...
@@ -45,3 +46,5 @@ 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
sql-data-file =
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