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
Romain Courteaud
slapos
Commits
fb88a41a
Commit
fb88a41a
authored
Mar 01, 2012
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "remove git targets. It should be removed during the merge"
This reverts commit
e3bff39d
.
parent
e3bff39d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
0 deletions
+7
-0
component/slapos/buildout.cfg
component/slapos/buildout.cfg
+1
-0
slapos/recipe/davstorage/__init__.py
slapos/recipe/davstorage/__init__.py
+1
-0
slapos/recipe/lamp/__init__.py
slapos/recipe/lamp/__init__.py
+4
-0
slapos/recipe/librecipe/generic.py
slapos/recipe/librecipe/generic.py
+1
-0
No files found.
component/slapos/buildout.cfg
View file @
fb88a41a
...
@@ -155,4 +155,5 @@ supervisor = 3.0a12
...
@@ -155,4 +155,5 @@ supervisor = 3.0a12
# Required by:
# Required by:
# slapos.core==0.23
# slapos.core==0.23
>>>>>>> master
zope.interface = 3.8.0
zope.interface = 3.8.0
slapos/recipe/davstorage/__init__.py
View file @
fb88a41a
...
@@ -109,3 +109,4 @@ def promise(args):
...
@@ -109,3 +109,4 @@ def promise(args):
connection
.
getresponse
()
connection
.
getresponse
()
return
0
return
0
>>>>>>>
master
slapos/recipe/lamp/__init__.py
View file @
fb88a41a
...
@@ -172,11 +172,13 @@ class BaseRecipe(BaseSlapRecipe):
...
@@ -172,11 +172,13 @@ class BaseRecipe(BaseSlapRecipe):
argument
=
argument
+
[
"-d"
,
mysql_conf
[
'mysql_database'
],
argument
=
argument
+
[
"-d"
,
mysql_conf
[
'mysql_database'
],
"-H"
,
mysql_conf
[
'mysql_host'
],
"-P"
,
mysql_conf
[
'mysql_port'
],
"-H"
,
mysql_conf
[
'mysql_host'
],
"-P"
,
mysql_conf
[
'mysql_port'
],
"-p"
,
mysql_conf
[
'mysql_password'
],
"-u"
,
mysql_conf
[
'mysql_user'
],
"-p"
,
mysql_conf
[
'mysql_password'
],
"-u"
,
mysql_conf
[
'mysql_user'
],
=======
argument
=
[
self
.
options
[
'lampconfigure_directory'
].
strip
(),
argument
=
[
self
.
options
[
'lampconfigure_directory'
].
strip
(),
"-H"
,
mysql_conf
[
'mysql_host'
],
"-P"
,
mysql_conf
[
'mysql_port'
],
"-H"
,
mysql_conf
[
'mysql_host'
],
"-P"
,
mysql_conf
[
'mysql_port'
],
"-p"
,
mysql_conf
[
'mysql_password'
],
"-u"
,
mysql_conf
[
'mysql_user'
]]
"-p"
,
mysql_conf
[
'mysql_password'
],
"-u"
,
mysql_conf
[
'mysql_user'
]]
if
not
self
.
options
.
has_key
(
'file_token'
):
if
not
self
.
options
.
has_key
(
'file_token'
):
argument
=
argument
+
[
"-d"
,
mysql_conf
[
'mysql_database'
],
argument
=
argument
+
[
"-d"
,
mysql_conf
[
'mysql_database'
],
>>>>>>>
master
"--table"
,
self
.
options
[
'table_name'
].
strip
(),
"--cond"
,
"--table"
,
self
.
options
[
'table_name'
].
strip
(),
"--cond"
,
self
.
options
[
'constraint'
].
strip
()]
self
.
options
[
'constraint'
].
strip
()]
else
:
else
:
...
@@ -238,6 +240,7 @@ class Simple(BaseRecipe):
...
@@ -238,6 +240,7 @@ class Simple(BaseRecipe):
rename
=
renamed
,
rename
=
renamed
,
**
mysql_conf
**
mysql_conf
))
))
=======
renamed
=
self
.
configureInstallation
(
document_root
,
url
,
mysql_conf
)
renamed
=
self
.
configureInstallation
(
document_root
,
url
,
mysql_conf
)
connectionDict
=
dict
(
connectionDict
=
dict
(
url
=
url
,
url
=
url
,
...
@@ -246,6 +249,7 @@ class Simple(BaseRecipe):
...
@@ -246,6 +249,7 @@ class Simple(BaseRecipe):
if
not
renamed
==
""
:
if
not
renamed
==
""
:
connectionDict
[
'rename'
]
=
renamed
connectionDict
[
'rename'
]
=
renamed
self
.
setConnectionDict
(
connectionDict
)
self
.
setConnectionDict
(
connectionDict
)
>>>>>>>
master
if
self
.
options
.
has_key
(
'template'
)
and
self
.
options
.
has_key
(
'configuration'
):
if
self
.
options
.
has_key
(
'template'
)
and
self
.
options
.
has_key
(
'configuration'
):
self
.
createConfiguration
(
self
.
options
[
'template'
],
document_root
,
self
.
createConfiguration
(
self
.
options
[
'template'
],
document_root
,
self
.
options
[
'configuration'
],
mysql_conf
)
self
.
options
[
'configuration'
],
mysql_conf
)
...
...
slapos/recipe/librecipe/generic.py
View file @
fb88a41a
...
@@ -167,3 +167,4 @@ class GenericBaseRecipe(object):
...
@@ -167,3 +167,4 @@ class GenericBaseRecipe(object):
url
=
urlparse
.
urlunparse
((
scheme
,
netloc
,
path
,
params
,
query
,
fragment
))
url
=
urlparse
.
urlunparse
((
scheme
,
netloc
,
path
,
params
,
query
,
fragment
))
return
url
return
url
>>>>>>>
master
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