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
Leo Le Bouter
slapos
Commits
e9a3a93e
Commit
e9a3a93e
authored
Oct 17, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixup of
1fc12f31
.
Wrong merge result -- HEAD part was not removed.
parent
a8a17dd0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
42 deletions
+0
-42
slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/__init__.py
+0
-42
No files found.
slapos/recipe/erp5/__init__.py
View file @
e9a3a93e
...
@@ -379,48 +379,6 @@ SSLCARevocationPath %(ca_crl)s"""
...
@@ -379,48 +379,6 @@ SSLCARevocationPath %(ca_crl)s"""
self
.
logger
.
debug
(
'Created link %r -> %r'
%
(
link
,
target
))
self
.
logger
.
debug
(
'Created link %r -> %r'
%
(
link
,
target
))
self
.
path_list
.
append
(
link
)
self
.
path_list
.
append
(
link
)
<<<<<<<
HEAD
def
installKumo
(
self
,
ip
,
kumo_manager_port
=
13101
,
kumo_server_port
=
13201
,
kumo_server_listen_port
=
13202
,
kumo_gateway_port
=
13301
):
# XXX: kumo is not storing pid in file, unless it is not running as daemon
# but running daemons is incompatible with SlapOS, so there is currently
# no way to have Kumo's pid files to rotate logs and send signals to them
config
=
dict
(
kumo_gateway_binary
=
self
.
options
[
'kumo_gateway_binary'
],
kumo_gateway_ip
=
ip
,
kumo_gateway_log
=
os
.
path
.
join
(
self
.
log_directory
,
"kumo-gateway.log"
),
kumo_manager_binary
=
self
.
options
[
'kumo_manager_binary'
],
kumo_manager_ip
=
ip
,
kumo_manager_log
=
os
.
path
.
join
(
self
.
log_directory
,
"kumo-manager.log"
),
kumo_server_binary
=
self
.
options
[
'kumo_server_binary'
],
kumo_server_ip
=
ip
,
kumo_server_log
=
os
.
path
.
join
(
self
.
log_directory
,
"kumo-server.log"
),
kumo_server_storage
=
os
.
path
.
join
(
self
.
data_root_directory
,
"kumodb.tch"
),
kumo_manager_port
=
kumo_manager_port
,
kumo_server_port
=
kumo_server_port
,
kumo_server_listen_port
=
kumo_server_listen_port
,
kumo_gateway_port
=
kumo_gateway_port
)
self
.
path_list
.
append
(
self
.
createRunningWrapper
(
'kumo_gateway'
,
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'kumo_gateway.in'
),
config
)))
self
.
path_list
.
append
(
self
.
createRunningWrapper
(
'kumo_manager'
,
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'kumo_manager.in'
),
config
)))
self
.
path_list
.
append
(
self
.
createRunningWrapper
(
'kumo_server'
,
self
.
substituteTemplate
(
self
.
getTemplateFilename
(
'kumo_server.in'
),
config
)))
return
dict
(
kumo_address
=
'%s:%s'
%
(
config
[
'kumo_gateway_ip'
],
config
[
'kumo_gateway_port'
]),
kumo_gateway_ip
=
config
[
'kumo_gateway_ip'
],
kumo_gateway_port
=
config
[
'kumo_gateway_port'
],
)
def
installSphinxSearchd
(
self
,
ip
,
port
=
9312
,
sql_port
=
9306
):
def
installSphinxSearchd
(
self
,
ip
,
port
=
9312
,
sql_port
=
9306
):
data_directory
=
self
.
createDataDirectory
(
'sphinx'
)
data_directory
=
self
.
createDataDirectory
(
'sphinx'
)
sphinx_conf_path
=
self
.
createConfigurationFile
(
'sphinx.conf'
,
sphinx_conf_path
=
self
.
createConfigurationFile
(
'sphinx.conf'
,
...
...
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