Merge branch 'master' into dist/envole/7/master

dicos/90_nineschool.xml

@@ -2,6 +2,7 @@
 <creole>
     <files>
         <file filelist='nineschool' name='/etc/eole/eole-db.d/nineschool-db.yml' rm='True' mkdir='True'/>
+        <file filelist='nineschool_nginx' name='/etc/nginx/web.d/nineschool.conf' source='nineschool-nginx.conf' rm='True' mkdir='True' />   
     </files>
 
 	<containers>
@@ -22,7 +23,7 @@
         <family name='nineschool' icon='eye-open'>
             <variable name="ninegate_test_ninegate" type="oui/non" hidden='True' exists='False'><value>non</value></variable>
 
-			<variable name='activer_nineschool' type='oui/non' description='Activer nineschool'>
+			<variable name='activer_nineschool' type='oui/non' description='Activer Nineschool'>
 				<value>oui</value>
 			</variable>
 
@@ -76,9 +77,21 @@
         <condition name='hidden_if_in' source='activer_apache'>
             <param>non</param>
             <target type='filelist'>nineschool</target>
+            <target type='filelist'>nineschool_nginx</target>
             <target type='servicelist'>nineschool</target>
         </condition>
 
+        <!-- AFFICHAGE EN FONCTION DE REVERSE PROXY -->
+        <condition name='hidden_if_in' source='activer_revprox'>
+            <param>non</param>
+            <target type='filelist'>nineschool_nginx</target>
+        </condition>
+
+        <!-- AFFICHAGE EN FONCTION DE REVERSE PROXY -->
+        <condition name='disabled_if_in' source='activer_revprox'>
+            <param>oui</param>
+            <target type='filelist'>nineboard_nginx</target>
+        </condition>
 
         <!-- AFFICHAGE EN FONCTION DE NINESCHOOL -->
 		<condition name='hidden_if_in' source='activer_nineschool'>
@@ -108,6 +121,7 @@
             <target type='variable'>nineschool_dbpass</target>
 
 			<target type='filelist'>nineschool</target>
+            <target type='filelist'>nineschool_nginx</target>
 			<target type='servicelist'>nineschool</target>
 		</condition>
 

tmpl/nineschool-apache.conf

@@ -7,3 +7,15 @@ Alias /nineschool /var/www/html/nineschool/public
     Options Indexes FollowSymLinks MultiViews
     php_admin_flag allow_url_fopen On
 </Directory>
+
+# Pour activer un serveur websocket sur l'application
+# Attention choisir un port libre dans 
+# 5546 = nineskeletor
+# 5556 = ninegate
+# 5566 = nineboard
+# 5576 = nineschool
+# 5586 = ninesurvey
+# 5587 = ninetraining
+# 5596 = janus
+ProxyPass "/wssnineschool" "ws://0.0.0.0:5576" retry=0 keepalive=On
+ProxyPassReverse "/wssnineschool" "ws://0.0.0.0:5576" retry=0 

tmpl/nineschool-env.local

@@ -1,6 +1,7 @@
 # SYMFONY
 APP_ENV=PROD
-APP_SECRET=%%pwdreader("","/var/www/html/nineschool/.key")
+%set keyfile = %%getVar('container_path_web','') + '/var/www/html/nineschool/.key'
+APP_SECRET=%%pwdreader("",%%keyfile)
 #TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
 #TRUSTED_HOSTS='^(localhost|example\.com)$'
 

tmpl/nineschool-nginx.conf

@@ -0,0 +1,6 @@
+    location /wssnineschool {
+        proxy_pass https://%%container_ip_web;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }