From 3d9fdd85976ffbd5856200ae6c4e68186644aa90 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 22 Dec 2022 22:47:36 +0100 Subject: [PATCH] Fix bug in Reverse Proxy Protocol parsing for Apache 2.2/2.4 --- bin/vhost-gen | 4 ++-- etc/templates/apache22.yml | 4 ++-- etc/templates/apache24.yml | 4 ++-- setup.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/vhost-gen b/bin/vhost-gen index 893f22c..2360e12 100755 --- a/bin/vhost-gen +++ b/bin/vhost-gen @@ -29,8 +29,8 @@ if os.environ.get("MYPY_CHECK", False): # -------------------------------------------------------------------------------------------------- APPNAME = "vhost-gen" APPREPO = "https://github.com/devilbox/vhost-gen" -VERSION = "1.0.6" -RELDATE = "2022-12-18" +VERSION = "1.0.7" +RELDATE = "2022-12-22" # Default paths CONFIG_PATH = "/etc/vhost-gen/conf.yml" diff --git a/etc/templates/apache22.yml b/etc/templates/apache22.yml index c40db44..619eaca 100644 --- a/etc/templates/apache22.yml +++ b/etc/templates/apache22.yml @@ -88,8 +88,8 @@ vhost_type: rproxy: | # Define the vhost to reverse proxy ProxyRequests off - ProxyPass __LOCATION__ __PROXY_PROTO://__PROXY_ADDR__:__PROXY_PORT__ - ProxyHTMLURLMap __PROXY_PROTO://__PROXY_ADDR__:__PROXY_PORT__ __LOCATION__ + ProxyPass __LOCATION__ __PROXY_PROTO__://__PROXY_ADDR__:__PROXY_PORT__ + ProxyHTMLURLMap __PROXY_PROTO__://__PROXY_ADDR__:__PROXY_PORT__ __LOCATION__ ProxyPassReverse / SetOutputFilter proxy-html diff --git a/etc/templates/apache24.yml b/etc/templates/apache24.yml index b7ecb99..2ab661a 100644 --- a/etc/templates/apache24.yml +++ b/etc/templates/apache24.yml @@ -90,8 +90,8 @@ vhost_type: rproxy: | # Define the vhost to reverse proxy ProxyRequests off - ProxyPass __LOCATION__ __PROXY_PROTO://__PROXY_ADDR__:__PROXY_PORT__ - ProxyHTMLURLMap __PROXY_PROTO://__PROXY_ADDR__:__PROXY_PORT__ __LOCATION__ + ProxyPass __LOCATION__ __PROXY_PROTO__://__PROXY_ADDR__:__PROXY_PORT__ + ProxyHTMLURLMap __PROXY_PROTO__://__PROXY_ADDR__:__PROXY_PORT__ __LOCATION__ ProxyPassReverse / SetOutputFilter proxy-html diff --git a/setup.py b/setup.py index 4beb209..9038652 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name="vhost-gen", - version="1.0.6", + version="1.0.7", description="Configurable vHost generator for Apache 2.2, Apache 2.4 and Nginx.", license="MIT", long_description=long_description,