Merge branch 'feature/served_by_apache' into packaging

This commit is contained in:
Benjamin Bohard 2019-09-03 10:26:03 +02:00
commit b56146d6a0
3 changed files with 15 additions and 3 deletions

View File

@ -23,7 +23,11 @@ ErrorDocument 500 https//%%authWebName/lmerror/500
ErrorDocument 502 https//%%authWebName/lmerror/502 ErrorDocument 502 https//%%authWebName/lmerror/502
ErrorDocument 503 https//%%authWebName/lmerror/503 ErrorDocument 503 https//%%authWebName/lmerror/503
<VirtualHost *:443> %if %%container_ip_web != '127.0.0.1'
<VirtualHost %%container_ip_web:443>
%else
<VirtualHost %%adresse_ip_eth0:443>
%end if
ServerName %%reloadWebName ServerName %%reloadWebName
# Configuration reload mechanism (only 1 per physical server is # Configuration reload mechanism (only 1 per physical server is

View File

@ -7,7 +7,11 @@
#LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng #LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng
# Manager virtual host (manager.__DNSDOMAIN__) # Manager virtual host (manager.__DNSDOMAIN__)
<VirtualHost *:443> %if %%container_ip_web != '127.0.0.1'
<VirtualHost %%container_ip_web:443>
%else
<VirtualHost %%adresse_ip_eth0:443>
%end if
ServerName %%managerWebName ServerName %%managerWebName
LogLevel notice LogLevel notice
# See above to set LLNG user id in Apache logs # See above to set LLNG user id in Apache logs

View File

@ -7,7 +7,11 @@
#LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng #LogFormat "%v:%p %h %l %{Lm-Remote-User}o %t \"%r\" %>s %O" llng
# Portal Virtual Host (auth.__DNSDOMAIN__) # Portal Virtual Host (auth.__DNSDOMAIN__)
<VirtualHost *:443> %if %%container_ip_web != '127.0.0.1'
<VirtualHost %%container_ip_web:443>
%else
<VirtualHost %%adresse_ip_eth0:443>
%end if
ServerName %%authWebName ServerName %%authWebName
# See above to set LLNG user id in Apache logs # See above to set LLNG user id in Apache logs
#CustomLog ${APACHE_LOG_DIR}/portal.log llng #CustomLog ${APACHE_LOG_DIR}/portal.log llng