Commit 192f21f7 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Fixes in the proxy default behaviour for both standard and SSL connections.

parent 9bdc1ffb

services/proxy/000-default.conf

+6 −6
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
    #ServerName www.example.com



    ServerAdmin webmaster@backfrontend

    ProxyPass / http://cloud:8080/

    ProxyPassReverse / http://cloud:8080/

    ProxyPass / http://webapp:8080/

    ProxyPassReverse / http://webapp:8080/



    # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,

    # error, crit, alert, emerg.
@@ -18,8 +18,8 @@ 
    # modules, e.g.

    #LogLevel info ssl:warn



    ErrorLog ${APACHE_LOG_DIR}/error.log

    CustomLog ${APACHE_LOG_DIR}/access.log combined

    #ErrorLog ${APACHE_LOG_DIR}/error.log

    #CustomLog ${APACHE_LOG_DIR}/access.log combined



    # For most configuration files from conf-available/, which are

    # enabled or disabled at a global level, it is possible to
@@ -41,8 +41,8 @@ 
    #RewriteCond %{HTTP_HOST} !=localhost

    #RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}

    

    ProxyPass / http://cloud:8080/

    ProxyPassReverse / http://cloud:8080/ 

    ProxyPass / http://webapp:8080/

    ProxyPassReverse / http://webapp:8080/ 

       

</VirtualHost>

services/proxy/001-proxy.conf

+0 −66
Original line number Diff line number Diff line
@@ -24,71 +24,5 @@ 
    

</VirtualHost>





#---------------------------

#  Localhost

#---------------------------



# Non-SSL 

<VirtualHost *:80>



    ServerName localhost

    ProxyPass / http://webapp:8080/

    ProxyPassReverse / http://webapp:8080/



</VirtualHost>



# SSL

<VirtualHost *:443>



    ServerName localhost

     

    SSLEngine on



    SSLCertificateFile /root/certificates/rosetta_platform/rosetta_platform.crt

    SSLCertificateKeyFile /root/certificates/rosetta_platform/rosetta_platform.key

    SSLCACertificateFile /root/certificates/rosetta_platform/rosetta_platform.ca-bundle

    #SSLCertificateFile  /etc/ssl/certs/ssl-cert-snakeoil.pem

    #SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key

    #SSLCACertificateFile /etc/ssl/certs/ca-certificates.crt



    ProxyPass / http://webapp:8080/

    ProxyPassReverse / http://webapp:8080/



</VirtualHost>





#---------------------------

#  Anything

#---------------------------



# Non-SSL 

<VirtualHost *:80>



    ProxyPass / http://webapp:8080/

    ProxyPassReverse / http://webapp:8080/



</VirtualHost>



# SSL

<VirtualHost *:443>

  

    SSLEngine on



    SSLCertificateFile /root/certificates/rosetta_platform/rosetta_platform.crt

    SSLCertificateKeyFile /root/certificates/rosetta_platform/rosetta_platform.key

    SSLCACertificateFile /root/certificates/rosetta_platform/rosetta_platform.ca-bundle

    #SSLCertificateFile  /etc/ssl/certs/ssl-cert-snakeoil.pem

    #SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key

    #SSLCACertificateFile /etc/ssl/certs/ca-certificates.crt



    ProxyPass / http://webapp:8080/

    ProxyPassReverse / http://webapp:8080/



</VirtualHost>









# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

services/proxy/default-ssl.conf

+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
    <VirtualHost _default_:443>

        ServerAdmin webmaster@localhost



        ProxyPass / http://cloud:8080/

        ProxyPassReverse / http://cloud:8080/

        ProxyPass / http://webapp:8080/

        ProxyPassReverse / http://webapp:8080/



        # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,

        # error, crit, alert, emerg.
@@ -11,8 +11,8 @@ 
        # modules, e.g.

        #LogLevel info ssl:warn



        ErrorLog ${APACHE_LOG_DIR}/error.log

        CustomLog ${APACHE_LOG_DIR}/access.log combined

        #ErrorLog ${APACHE_LOG_DIR}/error.log

        #CustomLog ${APACHE_LOG_DIR}/access.log combined



        # For most configuration files from conf-available/, which are

        # enabled or disabled at a global level, it is possible to