Cadoles
/
nineschool
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Arnaud Fornerot 2021-12-07 09:12:56 +01:00
parent 5e814b948c f298298fb4
commit 714a6e5a9c
4 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dicos/90_nineschool.xml
View File

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

14
tmpl/nineschool-apache.conf
View File

@ -6,4 +6,16 @@ Alias /nineschool /var/www/html/nineschool/public
Allow from All Allow from All
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
php_admin_flag allow_url_fopen On php_admin_flag allow_url_fopen On
</Directory> </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

3
tmpl/nineschool-env.local
View File

@ -1,6 +1,7 @@
# SYMFONY # SYMFONY
APP_ENV=PROD 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_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)$' #TRUSTED_HOSTS='^(localhost|example\.com)$'

6
tmpl/nineschool-nginx.conf Normal file
View File

@ -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";
}