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
Eric Zheng
slapos
Commits
ee2b018f
Commit
ee2b018f
authored
Jun 08, 2011
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use IPv6 for public access to cloudooo directly.
parent
4878f87f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
slapos/recipe/cloudooo/__init__.py
slapos/recipe/cloudooo/__init__.py
+5
-3
slapos/recipe/cloudooo/cloudooo.cfg.in
slapos/recipe/cloudooo/cloudooo.cfg.in
+1
-1
No files found.
slapos/recipe/cloudooo/__init__.py
View file @
ee2b018f
...
@@ -43,12 +43,13 @@ class Recipe(BaseSlapRecipe):
...
@@ -43,12 +43,13 @@ class Recipe(BaseSlapRecipe):
[(
'killpidfromfile'
,
'slapos.recipe.erp5.killpidfromfile'
,
[(
'killpidfromfile'
,
'slapos.recipe.erp5.killpidfromfile'
,
'killpidfromfile'
)],
self
.
ws
,
sys
.
executable
,
self
.
bin_directory
)[
0
]
'killpidfromfile'
)],
self
.
ws
,
sys
.
executable
,
self
.
bin_directory
)[
0
]
self
.
path_list
.
append
(
self
.
killpidfromfile
)
self
.
path_list
.
append
(
self
.
killpidfromfile
)
ip
=
self
.
getGlobalIPv6Address
()
conversion_server_conf
=
self
.
installConversionServer
(
conversion_server_conf
=
self
.
installConversionServer
(
self
.
getLocalIPv4Address
(),
23000
,
23060
)
ip
,
23000
,
self
.
getLocalIPv4Address
()
,
23060
)
self
.
linkBinary
()
self
.
linkBinary
()
self
.
setConnectionDict
(
dict
(
self
.
setConnectionDict
(
dict
(
site_url
=
"http://
%s:%s/"
%
(
self
.
getLocalIPv4Address
()
,
23000
),
site_url
=
"http://
[%s]:%s/"
%
(
ip
,
23000
),
))
))
return
self
.
path_list
return
self
.
path_list
...
@@ -74,7 +75,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -74,7 +75,7 @@ class Recipe(BaseSlapRecipe):
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
)
def
installConversionServer
(
self
,
ip
,
port
,
openoffice_port
):
def
installConversionServer
(
self
,
ip
,
port
,
openoffice_
host
,
openoffice_
port
):
name
=
'conversion_server'
name
=
'conversion_server'
working_directory
=
self
.
createDataDirectory
(
name
)
working_directory
=
self
.
createDataDirectory
(
name
)
conversion_server_dict
=
dict
(
conversion_server_dict
=
dict
(
...
@@ -84,6 +85,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -84,6 +85,7 @@ class Recipe(BaseSlapRecipe):
ip
=
ip
,
ip
=
ip
,
port
=
port
,
port
=
port
,
openoffice_port
=
openoffice_port
,
openoffice_port
=
openoffice_port
,
openoffice_host
=
openoffice_host
)
)
for
env_line
in
self
.
options
[
'environment'
].
splitlines
():
for
env_line
in
self
.
options
[
'environment'
].
splitlines
():
env_line
=
env_line
.
strip
()
env_line
=
env_line
.
strip
()
...
...
slapos/recipe/cloudooo/cloudooo.cfg.in
View file @
ee2b018f
...
@@ -29,7 +29,7 @@ limit_memory_used = 3000
...
@@ -29,7 +29,7 @@ limit_memory_used = 3000
## OOFactory Settings
## OOFactory Settings
#
#
# The pool consist of several OpenOffice.org instances
# The pool consist of several OpenOffice.org instances
application_hostname = %(
ip
)s
application_hostname = %(
openoffice_host
)s
# OpenOffice Port
# OpenOffice Port
openoffice_port = %(openoffice_port)s
openoffice_port = %(openoffice_port)s
# LD_LIBRARY_PATH passed to OpenOffice
# LD_LIBRARY_PATH passed to OpenOffice
...
...
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