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
Guillaume Hervier
slapos
Commits
75912c7f
Commit
75912c7f
authored
Apr 22, 2013
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add hack to allow nginx to communicate with zimbra-kvm.
parent
7735ef7e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
slapos/recipe/zimbra_kvm/template/kvm_run.in
slapos/recipe/zimbra_kvm/template/kvm_run.in
+2
-2
software/zimbra-kvm/instance-kvm.cfg.in
software/zimbra-kvm/instance-kvm.cfg.in
+16
-1
No files found.
slapos/recipe/zimbra_kvm/template/kvm_run.in
View file @
75912c7f
...
...
@@ -33,11 +33,11 @@ if not os.path.exists(disk_path):
disk_path, '%(disk_size)sG'])
# Generate NAT rules
nat_rules =
",".join("hostfwd=tcp:%(vnc_ip)s:%%s-:%%s" %% (port, port) for port in [25,
80, 110, 143, 443, 465, 587, 993, 995, 7071])
nat_rules =
'hostfwd=tcp:%(vnc_ip)s:2222-:22,hostfwd=tcp:%(vnc_ip)s:2525-:25,' + ','.join("hostfwd=tcp:%(vnc_ip)s:%%s-:%%s" %% (port, port) for port in [
80, 110, 143, 443, 465, 587, 993, 995, 7071])
kvm_argument_list = ['%(qemu_path)s',
'-enable-kvm', '-net', 'nic,macaddr=%(mac_address)s',
'-net', 'user,
hostfwd=tcp:%(vnc_ip)s:2222-:22,
%%s' %% nat_rules,
'-net', 'user,%%s' %% nat_rules,
'-smp', '%(smp_count)s',
'-m', '%(ram_size)s',
'-drive', 'file=%(disk_path)s,if=%(disk_type)s',
...
...
software/zimbra-kvm/instance-kvm.cfg.in
View file @
75912c7f
...
...
@@ -8,6 +8,7 @@ parts =
certificate-authority
request-web-frontend
kvm-promise
tunnel-ipv6-reverse-proxy
tunnel-ipv6-kvm-https
tunnel-ipv6-kvm-ssh
tunnel-ipv6-kvm-zimbra-admin
...
...
@@ -226,7 +227,21 @@ slave = true
config = smtp-upstream-host smtp-upstream-port
config-smtp-upstream-host = $${tunnel-ipv6-kvm-smtp:ipv6}
config-smtp-upstream-port = $${tunnel-ipv6-kvm-smtp:ipv6-port}
return = listening-ipv4
return = listening-ipv4 listening-ipv6
# Qemu doesn't support IPv6 in user-mode network.
# Solution: tunnel ipv6 of smtp reverse proxy to local ipv4 so that guest
# inside of KVM can connect to it.
[tunnel-ipv6-reverse-proxy]
recipe = slapos.cookbook:ipv4toipv6
ipv6 = $${request-smtp-frontend:connection-listening-ipv6}
ipv6-port = 25
ipv4 = $${slap-network-information:local-ipv4}
ipv4-port = 25
shell-path = ${dash:location}/bin/dash
6tunnel-path = ${6tunnel:location}/bin/6tunnel
runner-path = $${directory:services}/6tunnel-https
[publish-kvm-connection-information]
recipe = slapos.cookbook:publish
...
...
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