Merge pull request #49 from devilbox/release-1.0.7

Fix bug in Reverse Proxy Protocol parsing for Apache 2.2/2.4
devilbox · Dec 22, 2022 · 61a3aa7 · 61a3aa7
2 parents cb42b05 + 3d9fdd8
commit 61a3aa7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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__
     <location __LOCATION__>
         ProxyPassReverse /
         SetOutputFilter  proxy-html

diff --git 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__
     <location __LOCATION__>
         ProxyPassReverse /
         SetOutputFilter  proxy-html

diff --git 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,