Merge branch 'master' of https://lab.nexedi.com/kasra/slapos

software/apache-frontend/README.apache_frontend.rst

@@ -257,6 +257,7 @@ Simple Example
 ---------------
 
 Request slave frontend instance so that https://[1:2:3:4:5:6:7:8]:1234 will be
+
   instance = request(
     software_release=apache_frontend,
     software_type="RootSoftwareInstance",
@@ -265,7 +266,6 @@ Request slave frontend instance so that https://[1:2:3:4:5:6:7:8]:1234 will be
     software_type="custom-personal",
     partition_parameter_kw={
         "url":"https://[1:2:3:4:5:6:7:8]:1234",
-
         "apache_custom_https":'
   ServerName www.example.org
   ServerAlias example.org
@@ -278,7 +278,6 @@ Request slave frontend instance so that https://[1:2:3:4:5:6:7:8]:1234 will be
   ProxyTimeout 600
   RewriteEngine On
   RewriteRule ^/(.*) https://[1:2:3:4:5:6:7:8]:1234/$1 [L,P]',
-
         "apache_custom_http":'
   ServerName www.example.org
   ServerAlias www.example.org
@@ -313,7 +312,6 @@ Request slave frontend instance so that https://[1:2:3:4:5:6:7:8]:1234 will be
         "url":"https://[1:2:3:4:5:6:7:8]:1234",
 	"domain": "www.example.org",
 	"enable_cache": "True",
-
         "apache_custom_https":'
   ServerName www.example.org
   ServerAlias www.example.org
@@ -327,7 +325,6 @@ Request slave frontend instance so that https://[1:2:3:4:5:6:7:8]:1234 will be
   ProxyTimeout 600
   RewriteEngine On
   RewriteRule ^/(.*) %(cache_access)s/$1 [L,P]',
-
         "apache_custom_http":'
   ServerName www.example.org
   ServerAlias www.example.org
@@ -339,10 +336,8 @@ Request slave frontend instance so that https://[1:2:3:4:5:6:7:8]:1234 will be
   ProxyPreserveHost On
   ProxyTimeout 600
   RewriteEngine On
-
   # Remove "Secure" from cookies, as backend may be https
   Header edit Set-Cookie "(?i)^(.+);secure$" "$1"
-
   # Not using HTTPS? Ask that guy over there.
   # Dummy redirection to https. Note: will work only if https listens
   # on standard port (443).
@@ -370,7 +365,6 @@ the proxy::
         "type":"zope",
         "path":"/erp5",
         "domain":"example.org",
-
   	"apache_custom_https":'
   ServerName www.example.org
   ServerAlias www.example.org
@@ -399,7 +393,6 @@ the proxy::
   RewriteRule ^/$ /index.html [R=302,L]
   # Use cache
   RewriteRule ^/(.*) %(cache_access)s/VirtualHostBase/https/www.example.org:443/erp5/VirtualHostRoot/$1 [L,P]',
-
     "apache_custom_http":'
   ServerName www.example.org
   ServerAlias www.example.org