Merge pull request #25 from devilbox/release-0.5

Fix Apache 2.2/2.4 templates for SSL
devilbox · May 2, 2018 · 4e3a956 · 4e3a956
2 parents 35b9ce1 + 3b26c3a
commit 4e3a956
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bin/vhost_gen.py b/bin/vhost_gen.py
@@ -155,7 +155,7 @@ def print_help():
 
 def print_version():
     """Show program version."""
-    print('vhost_gen v0.4 (2018-04-29)')
+    print('vhost_gen v0.5 (2018-05-02)')
     print('cytopia <[email protected]>')
     print('https://github.com/devilbox/vhost-gen')
     print('The MIT License (MIT)')

diff --git a/etc/templates/apache22.yml b/etc/templates/apache22.yml
@@ -150,7 +150,7 @@ features:
 
   xdomain_request: |
     # Allow cross domain request from these hosts
-    SetEnvIf Origin "__REGEX__" AccessControlAllowOrigin=$0$1
+    SetEnvIf Origin "__REGEX__" AccessControlAllowOrigin=$0
     Header add Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
     Header always set Access-Control-Allow-Methods "POST, GET, OPTIONS, DELETE, PUT"
     Header always set Access-Control-Max-Age "0"

diff --git a/etc/templates/apache24.yml b/etc/templates/apache24.yml
@@ -167,7 +167,7 @@ features:
 
   xdomain_request: |
     # Allow cross domain request from these hosts
-    SetEnvIf Origin "__REGEX__" AccessControlAllowOrigin=$0$1
+    SetEnvIf Origin "__REGEX__" AccessControlAllowOrigin=$0
     Header add Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
     Header always set Access-Control-Allow-Methods "POST, GET, OPTIONS, DELETE, PUT"
     Header always set Access-Control-Max-Age "0"