diff --git a/dicos/90_ninegate.xml b/dicos/90_ninegate.xml index e3fe986c..d3aeb0c9 100644 --- a/dicos/90_ninegate.xml +++ b/dicos/90_ninegate.xml @@ -2,6 +2,7 @@ + @@ -12,7 +13,6 @@ - ninegate diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 46a04359..654a5547 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -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'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css index 59d5baf6..d93e64b6 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css @@ -68,14 +68,10 @@ border-radius: 0px; } -.widget-bordered .widget-event { - background-color: #fff !important; - padding:5px 10px 5px 10px !important; +.widget-bordered .widget-event { + background-color: #fff !important; + color :#000 !important; + padding: 5px !important; border-radius: 10px; - color: #000 !important; - margin-top: 5px; + margin-bottom: 5px; } - -.mychat .message { - border-radius: 10px; -} \ No newline at end of file diff --git a/tmpl/ninegate-apache.conf b/tmpl/ninegate-apache.conf index 773bc4db..5d5ddfc9 100644 --- a/tmpl/ninegate-apache.conf +++ b/tmpl/ninegate-apache.conf @@ -6,4 +6,19 @@ Alias /ninegate /var/www/html/ninegate/web Allow from All Options Indexes FollowSymLinks MultiViews php_admin_flag allow_url_fopen On - \ No newline at end of file + + +Listen %%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 + \ No newline at end of file diff --git a/tmpl/ninegate-posttemplate.sh b/tmpl/ninegate-posttemplate.sh new file mode 100755 index 00000000..a4782a6d --- /dev/null +++ b/tmpl/ninegate-posttemplate.sh @@ -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 diff --git a/tmpl/ninegate.nginx.conf b/tmpl/ninegate.nginx.conf deleted file mode 100644 index 4cbe81b0..00000000 --- a/tmpl/ninegate.nginx.conf +++ /dev/null @@ -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; - } -} \ No newline at end of file