Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
43836db7
Commit
43836db7
authored
Nov 20, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
root instance for default software_type
parent
c6489887
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
5 deletions
+24
-5
software/maarch/software.cfg
software/maarch/software.cfg
+2
-2
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+9
-1
stack/lapp/instance-default-root.cfg.in
stack/lapp/instance-default-root.cfg.in
+10
-0
stack/lapp/instance.cfg.in
stack/lapp/instance.cfg.in
+3
-2
No files found.
software/maarch/software.cfg
View file @
43836db7
...
...
@@ -8,8 +8,8 @@ parts =
apache-php-postgres
pear-modules
eggs
templat
e
templat
e-apache-php
instanc
e
instanc
e-apache-php
#----------------
...
...
stack/lapp/buildout.cfg
View file @
43836db7
...
...
@@ -7,6 +7,8 @@ parts =
instance-apache-php
instance-postgres
instance-default-root
extends =
../../component/apache/buildout.cfg
../../component/apache-php/buildout.cfg
...
...
@@ -36,7 +38,7 @@ strip-top-level-dir = true
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
md5sum =
fad4fe349039b9bac5f95322af1b8f5a
md5sum =
35d440866b4253dfa9f5ff291835fa50
mode = 0644
[instance-apache-php]
...
...
@@ -75,6 +77,12 @@ library-dirs =
rpath =
${postgresql:location}/lib
[instance-default-root]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-default-root.cfg.in
output = ${buildout:directory}/instance-default-root.cfg
md5sum = 53c9020f7a0b5203f976e069e455787b
mode = 0644
#----------------
#--
...
...
stack/lapp/instance-default-root.cfg.in
0 → 100644
View file @
43836db7
[buildout]
parts = request-apache
[request-apache]
<= slap-connection
recipe = slapos.cookbook:request
software-url = $${slap-connection:software-release-url}
software-type = apache
name = Apache
stack/lapp/instance.cfg.in
View file @
43836db7
...
...
@@ -8,5 +8,6 @@ offline = true
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${template-apache-php:output}
postgres = ${template-postgres:output}
default = ${instance-default-root:output}
apache = ${instance-apache-php:output}
postgres = ${instance-postgres:output}
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