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
7a329a4e
Commit
7a329a4e
authored
Oct 17, 2011
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix: use default value in optionIsTrue
parent
6d4265e4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
117 deletions
+3
-117
slapos/recipe/librecipe/generic.py
slapos/recipe/librecipe/generic.py
+2
-0
software/wordpress/instance-wordpress.cfg
software/wordpress/instance-wordpress.cfg
+0
-28
software/wordpress/instance.cfg
software/wordpress/instance.cfg
+0
-12
software/wordpress/software.cfg
software/wordpress/software.cfg
+1
-32
stack/apache-php.cfg
stack/apache-php.cfg
+0
-45
No files found.
slapos/recipe/librecipe/generic.py
View file @
7a329a4e
...
@@ -120,4 +120,6 @@ class GenericBaseRecipe(object):
...
@@ -120,4 +120,6 @@ class GenericBaseRecipe(object):
return
str
(
value
).
lower
()
in
GenericBaseRecipe
.
TRUE_VALUES
return
str
(
value
).
lower
()
in
GenericBaseRecipe
.
TRUE_VALUES
def
optionIsTrue
(
self
,
optionname
,
default
=
None
):
def
optionIsTrue
(
self
,
optionname
,
default
=
None
):
if
default
is
not
None
and
optionname
not
in
self
.
options
:
return
default
return
self
.
isTrueValue
(
self
.
options
[
optionname
])
return
self
.
isTrueValue
(
self
.
options
[
optionname
])
software/wordpress/instance-wordpress.cfg
deleted
100644 → 0
View file @
6d4265e4
[buildout]
parts =
apache-php
request-mariadb
mkdir
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[apache-php]
recipe = slapos.cookbook:lamp.request
source = ${application:location}
template = ${application-template:location}/${application-template:filename}
configuration = ${application-configuration:location}
httpd_binary = ${apache:location}/bin/httpd
stunnel_binary = ${stunnel:location}/bin/stunnel
mysql-url = $${request-mariadb:connection-url}
[request-mariadb]
recipe = slapos.cookbook:request
name = MariaDB DataBase
software-url = $${slap_connection:software_release_url}
software-type = mariadb
return = url
software/wordpress/instance.cfg
deleted
100644 → 0
View file @
6d4265e4
[buildout]
parts =
switch_softwaretype
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${instance_wordpress:output}
mariadb = ${instance_mariadb:output}
software/wordpress/software.cfg
View file @
7a329a4e
[buildout]
[buildout]
versions = versions
versions = versions
parts =
apache-php
template
eggs
instance-recipe-egg
instance_wordpress
instance_mariadb
extends =
extends =
../../component/gzip/buildout.cfg
../../stack/lamp/buildout.cfg
../../stack/apache-php.cfg
../../stack/shacache-client.cfg
# XXX: This is dirty, recipe trick shall be used.
# XXX: This is dirty, recipe trick shall be used.
develop =
develop =
...
@@ -44,28 +35,6 @@ recipe = zc.recipe.egg
...
@@ -44,28 +35,6 @@ recipe = zc.recipe.egg
python = python2.7
python = python2.7
eggs = ${instance-recipe:egg}
eggs = ${instance-recipe:egg}
[template]
# Default template for the instance.
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
md5sum = 817407b6bb7af1dce7588e259ead0d26
output = ${buildout:directory}/template.cfg
mode = 0644
[instance_mariadb]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/../mariadb/instance-mariadb.cfg
md5sum = 38aefa725d21988485c20ae9d58f9455
output = ${buildout:directory}/template-mariadb.cfg
mode = 0644
[instance_wordpress]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-wordpress.cfg
md5sum = 220e14b7a46742b1fd83d699c352b888
output = ${buildout:directory}/template-wordpress.cfg
mode = 0644
[versions]
[versions]
#slapos.cookbook = 0.12
#slapos.cookbook = 0.12
...
...
stack/apache-php.cfg
deleted
100644 → 0
View file @
6d4265e4
[buildout]
find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/
# Use only quite well working sites.
allow-hosts =
*.nexedi.org
*.python.org
*.sourceforge.net
dist.repoze.org
effbot.org
github.com
peak.telecommunity.com
psutil.googlecode.com
www.dabeaz.com
parts =
template
apache-php
mariadb
eggs
instance-recipe-egg
stunnel
extends =
../component/apache/buildout.cfg
../component/apache-php/buildout.cfg
../component/dcron/buildout.cfg
../component/git/buildout.cfg
../component/glib/buildout.cfg
../component/logrotate/buildout.cfg
../component/python-2.7/buildout.cfg
../component/lxml-python/buildout.cfg
../component/zlib/buildout.cfg
../component/stunnel/buildout.cfg
[application]
recipe = hexagonit.recipe.download
#If provided tarball does not containt top directory this option shall be changed to false
strip-top-level-dir = true
[eggs]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
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