apache-frontend: introduce 'redirect' type for slave instances

software/apache-frontend/common.cfg

@@ -78,7 +78,7 @@ mode = 0644
 [template-slave-list]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in
-md5sum = bae669cdc917c68186a387903478a53d
+md5sum = 1fe76dde85c488e94baf8510775ebcaf
 mode = 640
 
 [template-slave-configuration]
@@ -133,7 +133,7 @@ mode = 640
 [template-default-slave-virtualhost]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/default-virtualhost.conf.in
-md5sum = 8422c3c0d643edacfa8b11d2d1e5ce17
+md5sum = 5463dd67f1b1bea0bee57a421e371dd0
 mode = 640
 
 [template-log-access]

software/apache-frontend/instance-slave-apache-input-schema.json

@@ -25,10 +25,10 @@
 
     "type": {
       "title": "Backend Type",
-      "description": "Type of the backend",
+      "description": "Type of slave. If redirect, the slave will redirect to the given url. If zope, the rewrite rules will be compatible with Virtual Host Monster",
       "type": "string",
       "default": "",
-      "enum": ["", "zope"]
+      "enum": ["", "zope", "redirect"]
     },
 
     "path": {

software/apache-frontend/templates/apache-custom-slave-list.cfg.in

@@ -163,7 +163,7 @@ apache_custom_https = {{ dumps(apache_custom_https) }}
 
 # The slave use cache
 # Next line is forbidden and people who copy it will be hanged short
-{%     set enable_cache = ('' ~ slave_instance.get('enable_cache', '')).lower() in TRUE_VALUES -%}
+{%   set enable_cache = (('' ~ slave_instance.get('enable_cache', '')).lower() in TRUE_VALUES and slave_instance.get('type', '') != 'redirect') -%}
 {%     if enable_cache -%}
 {%       do cached_server_dict.__setitem__(slave_instance.get('custom_domain'), slave_instance.get('url')) -%}
 {%       do slave_instance.__setitem__('url', cache_access) -%}

software/apache-frontend/templates/default-virtualhost.conf.in

@@ -67,6 +67,8 @@
   # If so, let's use Virtual Host Daemon rewrite
   # We suppose that Apache listens to 443 (even indirectly thanks to things like iptables)
   RewriteRule ^/(.*)$ {{ slave_parameter.get('url', '') }}/VirtualHostBase/https/{{ slave_parameter.get('custom_domain', '') }}:443/{{ slave_parameter.get('path', '') }}/VirtualHostRoot/$1 [L,P]
+{% elif slave_parameter.get('type', '') ==  'redirect' -%}
+  RewriteRule     (.*)  {{slave_parameter.get('url', '')}}$1 [R,L]
 {% else -%}
   {% if 'default-path' in slave_parameter %}
   RewriteRule ^/?$ {{ slave_parameter.get('default-path') }} [R=301,L]
@@ -126,6 +128,8 @@
   # on standard port (443).
   RewriteCond     %{SERVER_PORT}  !^{{ https_port }}$
   RewriteRule     ^/(.*)          https://%{SERVER_NAME}/$1 [NC,R,L]
+{% elif slave_parameter.get('type', '') ==  'redirect' -%}
+  RewriteRule     (.*)  {{slave_parameter.get('url', '')}}$1 [R,L]
 {% elif slave_parameter.get('type', '') ==  'zope' -%}
   {% if 'default-path' in slave_parameter %}
   RewriteRule ^/?$ {{ slave_parameter.get('default-path') }} [R=301,L]