X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=p.vbz.ffzg.hr.conf;h=ede06fbe0408573fd064dbd6e7bbf0bf9dd355da;hb=8132920cff504aa279ae4c5937ab78e6eadf003c;hp=97d579af83a2d7f5ef751f1307403c39b446e158;hpb=108b5a05223c48181b03d3bc80bb6a323ac4f28e;p=via-proxy

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index 97d579a..ede06fb 100644
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -782,43 +782,6 @@ FilterChain NEWPATHS2
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 </VirtualHost>
 
-<VirtualHost *:443>
-	Include /srv/via-proxy/ssl.conf
-
-	ServerName jcr.incites.thomsonreuters.com.p.vbz.ffzg.hr
-
-	SSLProxyEngine on
-	ProxyAddHeaders Off
-	ProxyPass        / https://jcr.incites.thomsonreuters.com/
-	ProxyPassReverse / https://jcr.incites.thomsonreuters.com/
-
-	Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
-	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
-
-	Header edit* Location "(https://.*.incites.thomsonreuters.com)/?(.*)" "$1.p.vbz.ffzg.hr/$2"
-
-
-	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
-</VirtualHost>
-<VirtualHost *:443>
-	Include /srv/via-proxy/ssl.conf
-
-	ServerName login.incites.thomsonreuters.com.p.vbz.ffzg.hr
-
-	SSLProxyEngine on
-	ProxyAddHeaders Off
-	ProxyPass        / https://login.incites.thomsonreuters.com/
-	ProxyPassReverse / https://login.incites.thomsonreuters.com/
-
-	Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
-	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
-
-	# they really return http Location header even if everything else was
-	# behind https up to that point, AND https works
-	Header edit* Location "https?://(.*.incites.thomsonreuters.com)/?(.*)" "https://$1.p.vbz.ffzg.hr/$2"
-
-	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
-</VirtualHost>
 
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
@@ -889,6 +852,7 @@ FilterChain NEWPATHS2
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 </VirtualHost>
 
+IncludeOptional /srv/via-proxy/providers/*.conf