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
Iliya Manolov
slapos
Commits
0ab278c0
Commit
0ab278c0
authored
Jul 23, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Provides Sphinx over IPv6.
parent
a8ea156b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
3 deletions
+24
-3
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-sphinx.cfg.in
stack/erp5/instance-sphinx.cfg.in
+23
-2
No files found.
stack/erp5/buildout.cfg
View file @
0ab278c0
...
@@ -204,7 +204,7 @@ extra-context =
...
@@ -204,7 +204,7 @@ extra-context =
[template-sphinx]
[template-sphinx]
< = template-jinja2-base
< = template-jinja2-base
filename = instance-sphinx.cfg
filename = instance-sphinx.cfg
md5sum =
e3975afd5220f251d6b6e7024a2ca08b
md5sum =
c9d510c55a8f3562fe6346907002d4df
extra-context =
extra-context =
key sphinx_location sphinx:location
key sphinx_location sphinx:location
...
...
stack/erp5/instance-sphinx.cfg.in
View file @
0ab278c0
...
@@ -9,8 +9,8 @@ offline = true
...
@@ -9,8 +9,8 @@ offline = true
[publish-sphinx-url]
[publish-sphinx-url]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
url-sphinx = sphinx://
${sphinxd-instance:ip}:${sphinxd-instance:sphinx
-port}
url-sphinx = sphinx://
[${sphinx-tunnel:ipv6}]:${sphinx-tunnel:ipv6
-port}
url-sphinx-sql = mysql://
${sphinxd-instance:ip}:${sphinxd-instance:sql
-port}
url-sphinx-sql = mysql://
[${sphinx-sql-tunnel:ipv6}]:${sphinx-sql-tunnel:ipv6
-port}
[sphinxd-instance]
[sphinxd-instance]
recipe = slapos.cookbook:sphinx
recipe = slapos.cookbook:sphinx
...
@@ -25,6 +25,27 @@ sql-port = 9306
...
@@ -25,6 +25,27 @@ sql-port = 9306
wrapper = ${basedirectory:services}/sphinxd
wrapper = ${basedirectory:services}/sphinxd
sphinx-searchd-binary = {{ sphinx_location }}/bin/searchd
sphinx-searchd-binary = {{ sphinx_location }}/bin/searchd
[ipv6toipv4-base]
recipe = slapos.cookbook:ipv6toipv4
conf-path = ${rootdirectory:etc}/${:base-name}.conf
runner-path = ${basedirectory:services}/${:base-name}
haproxy-path = {{ haproxy_location }}/sbin/haproxy
shell-path = {{ dash_location }}/bin/dash
ipv4 = ${sphinxd-instance:ip}
ipv6 = ${slap-network-information:global-ipv6}
[sphinx-tunnel]
< = ipv6toipv4-base
base-name = sphinx-tunnel
ipv6-port = ${sphinxd-instance:sphinx-port}
ipv4-port = ${sphinxd-instance:sphinx-port}
[sphinx-sql-tunnel]
< = ipv6toipv4-base
base-name = sphinx-sql-tunnel
ipv6-port = ${sphinxd-instance:sql-port}
ipv4-port = ${sphinxd-instance:sql-port}
[rootdirectory]
[rootdirectory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc
etc = ${buildout:directory}/etc
...
...
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