From 6b515aef156a9790833997c2f5d4faa452884775 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Mon, 29 Sep 2014 15:02:50 +0200
Subject: [PATCH] dicos/99_one-frontend.xml: Ajout de la variable
 vnc_proxy_port_sunstone tmpl/sunstone-server.conf: Utilisation de la variable
 vnc_proxy_port_sunstone
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Le port VNC proxy est configurable. On utilise également les certificats de la
machine pour le proxy VNC et on ouvre les ports pour les IP qui peuvent faire du
SSH vers eth0.

fixes #7869 @2h
---
 dicos/99_one-frontend.xml | 7 +++++--
 tmpl/sunstone-server.conf | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dicos/99_one-frontend.xml b/dicos/99_one-frontend.xml
index c9947e3..00d1163 100644
--- a/dicos/99_one-frontend.xml
+++ b/dicos/99_one-frontend.xml
@@ -4,8 +4,8 @@
         <service type='service'>opennebula-sunstone</service>
         <file filelist='onefrontend' name='/etc/one/sunstone-server.conf' rm='True' mkdir='True'/>
         <service_access service='sunstone'>
-            <port>9000</port>
-	    <port>29876</port>
+            <port port_type="SymLinkOption">port_sunstone</port>
+            <port port_type="SymLinkOption">vnc_proxy_port_sunstone</port>
         </service_access>
         <service_restriction service='sunstone'>
             <ip interface='eth0' netmask='netmask_ssh_eth0' netmask_type='SymLinkOption' ip_type='SymLinkOption'>ip_ssh_eth0</ip>
@@ -19,6 +19,9 @@
             <variable name='port_sunstone' type='number' description="Numéro de port d'écoute d'OpenNebula Sunstone">
                 <value>9000</value>
             </variable>
+            <variable name='vnc_proxy_port_sunstone' type='number' description="Numéro de port d'écoute du proxy VNC">
+                 <value>29876</value>
+            </variable>
             <variable name='ip_sunstone' type='ip' description="Adresse IP d'écoute pour OpenNebula Sunstone"/>
             <variable name='langue_sunstone' type='string' description="Langue par défaut de l'interface" mode='expert'>
                 <value>fr_FR</value>
diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf
index 3c1d078..d3022bc 100644
--- a/tmpl/sunstone-server.conf
+++ b/tmpl/sunstone-server.conf
@@ -89,10 +89,10 @@
 #   vnc_proxy_cert: Certificate to encrypt wss connections.
 #   vnc_proxy_key:  Key for wss connections. Only necessary if not included in cert.
 #   vnc_proxy_ipv6: Enable ipv6 support for novnc-server
-:vnc_proxy_port: 29876
+:vnc_proxy_port: %%vnc_proxy_port_sunstone
 :vnc_proxy_support_wss: no
-:vnc_proxy_cert:
-:vnc_proxy_key:
+:vnc_proxy_cert: %%server_cert
+:vnc_proxy_key: %%server_key
 :vnc_proxy_ipv6: false