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
Sebastien Robin
slapos
Commits
35d12299
Commit
35d12299
authored
Feb 12, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LAPP: Remove root instance.
parent
7228dbea
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
25 deletions
+2
-25
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+1
-9
stack/lapp/instance-default-root.cfg.in
stack/lapp/instance-default-root.cfg.in
+0
-14
stack/lapp/instance.cfg.in
stack/lapp/instance.cfg.in
+1
-2
No files found.
stack/lapp/buildout.cfg
View file @
35d12299
...
@@ -15,8 +15,6 @@ parts =
...
@@ -15,8 +15,6 @@ parts =
instance-postgres-import
instance-postgres-import
instance-postgres-export
instance-postgres-export
instance-default-root
extends =
extends =
../resilient/buildout.cfg
../resilient/buildout.cfg
...
@@ -50,7 +48,7 @@ strip-top-level-dir = true
...
@@ -50,7 +48,7 @@ strip-top-level-dir = true
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 =
7e09e857ea14fee4a43a771afeafb677
md5sum =
a482fa0e72839b4bd75b169ac1460d64
mode = 0644
mode = 0644
[instance-apache-php]
[instance-apache-php]
...
@@ -124,12 +122,6 @@ library-dirs =
...
@@ -124,12 +122,6 @@ library-dirs =
rpath =
rpath =
${postgresql:location}/lib
${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 = 27c15556e7a8b14ae78123fe36b9afc3
mode = 0644
#----------------
#----------------
#--
#--
...
...
stack/lapp/instance-default-root.cfg.in
deleted
100644 → 0
View file @
7228dbea
[buildout]
parts = request-apache
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[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 @
35d12299
...
@@ -9,8 +9,7 @@ offline = true
...
@@ -9,8 +9,7 @@ offline = true
[switch_softwaretype]
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
default = ${instance-default-root:output}
default = ${instance-apache-php:output}
apache = ${instance-apache-php:output}
resilient = ${instance-resilient:rendered}
resilient = ${instance-resilient:rendered}
postgres = ${instance-postgres:output}
postgres = ${instance-postgres:output}
postgres-import = ${instance-postgres-import:output}
postgres-import = ${instance-postgres-import: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