This commit is contained in:
afornerot 2019-09-16 14:16:17 +02:00
parent 7b0327be3f
commit a704a8190d
6 changed files with 32 additions and 36 deletions

View File

@ -2,6 +2,7 @@
<creole>
<files>
<file filelist='ninegate' name='/etc/eole/eole-db.d/ninegate-db.yml' rm='True' mkdir='True'/>
<file filelist='ninegate' name='/usr/share/eole/posttemplate/90-ninegate' source="ninegate-posttemplate.sh" rm='True' mkdir='True' mode="700"/>
</files>
<containers>
@ -12,7 +13,6 @@
<file filelist="ninegate" name="/var/www/html/ninegate/scripts/ninegate-postservice-00.sh" source="ninegate-postservice-00.sh" rm="True" mode="700" />
<file filelist="ninegate" name="/var/www/html/ninegate/src/Cadoles/CoreBundle/Command/data/core-init-01.sql" source="ninegate-init-01.sql" rm="True"/>
<file filelist='ninegate' name='/etc/cron.d/ninegate' source='ninegate.cron' rm='True'/>
<file filelist='ninegate_websocket' name='/etc/nginx/conf.d/ninegate.conf' source='ninegate.nginx.conf' rm='True'/>
<service method='apache' servicelist='ninegate'>ninegate</service>

View File

@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
(-100, 'DRAAF', '130007107');
INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}euZCgZjWhBu0xUZI9lPK2ncV9oaB+Jqo
(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}2gaQmmZPBjiDFIDLVGRjTuzPm0TA4eQ9
', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');

View File

@ -70,12 +70,8 @@
.widget-bordered .widget-event {
background-color: #fff !important;
padding:5px 10px 5px 10px !important;
border-radius: 10px;
color :#000 !important;
margin-top: 5px;
}
.mychat .message {
padding: 5px !important;
border-radius: 10px;
margin-bottom: 5px;
}

View File

@ -7,3 +7,18 @@ Alias /ninegate /var/www/html/ninegate/web
Options Indexes FollowSymLinks MultiViews
php_admin_flag allow_url_fopen On
</Directory>
Listen %%adresse_ip_eth0:%%ninegate_websocket_portexterne
<VirtualHost %%adresse_ip_eth0:%%ninegate_websocket_portexterne>
ErrorLog /var/log/apache2/ssl_error.log
CustomLog /var/log/apache2/ssl_access.log common
SSLEngine on
SSLCertificateFile %%server_cert
SSLCertificateKeyFile %%server_key
SSLProtocol all -SSLv3 -SSLv2
ServerName %%ninegate_websocket_url
RewriteEngine On
ProxyPass / ws://%%adresse_ip_eth0:%%ninegate_websocket_portinterne retry=0 keepalive=On
ProxyPassReverse / ws://%%adresse_ip_eth0:%%ninegate_websocket_portinterne retry=0
</VirtualHost>

9
tmpl/ninegate-posttemplate.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/bash
if [ "$(CreoleGet activer_apache)" = 'oui' ];then
# gestion des modes apache
ENMOD="ssl rewrite authnz_ldap proxy headers proxy_http proxy_wstunnel"
CreoleRun "a2enmod $ENMOD >/dev/null" web
fi
exit 0

View File

@ -1,24 +0,0 @@
server {
listen %%ninegate_websocket_portexterne ssl;
ssl on;
ssl_certificate %%server_cert;
ssl_certificate_key %%server_key;
proxy_connect_timeout 600;
proxy_send_timeout 600;
proxy_read_timeout 600;
send_timeout 600;
location / {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Proxy "";
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://%%web_url:%%ninegate_websocket_portinterne;
}
}