From 4b0d392e5893dfa0eb58efb38f0b30a582aa4beb Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 16 Sep 2019 15:53:08 +0200 Subject: [PATCH] svg --- .../src/Cadoles/CoreBundle/Command/data/core-init-01.sql | 2 +- .../WebsocketBundle/Resources/views/Chat/client.html.twig | 3 +-- tmpl/ninegate-apache.conf | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) 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 654a5547..b16a6853 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}2gaQmmZPBjiDFIDLVGRjTuzPm0TA4eQ9 +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}30Z8NQIFHi2TUxnZr8sENMbBiOWgonju ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig index f2689063..cf356a77 100644 --- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig +++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig @@ -29,8 +29,7 @@ text-align: center; } .msgdiv { - float:left; - padding-left:10px; + padding-left:60px; } .msgtitle { line-height: 12px; diff --git a/tmpl/ninegate-apache.conf b/tmpl/ninegate-apache.conf index 5d5ddfc9..4503501c 100644 --- a/tmpl/ninegate-apache.conf +++ b/tmpl/ninegate-apache.conf @@ -13,8 +13,13 @@ Listen %%adresse_ip_eth0:%%ninegate_websocket_portexterne ErrorLog /var/log/apache2/ssl_error.log CustomLog /var/log/apache2/ssl_access.log common SSLEngine on + %if %%cert_type == "letsencrypt" + SSLCertificateFile /etc/ssl/letsencrypt/conf/live/%%ninegate_websocket_url/cert.pem + SSLCertificateKeyFile /etc/ssl/letsencrypt/conf/live/%%ninegate_websocket_url/privkey.pem + %else SSLCertificateFile %%server_cert SSLCertificateKeyFile %%server_key + %end if SSLProtocol all -SSLv3 -SSLv2 ServerName %%ninegate_websocket_url RewriteEngine On