upgrade aldryn-django 1.11.15.1 to 1.11.20.1

addons/aldryn-django/addon.json

@@ -1,4 +1,4 @@
 {
-    "installed-apps": [], 
+    "installed-apps": [],
     "package-name": "aldryn-django"
 }

addons/aldryn-django/aldryn_config.py

@@ -2,8 +2,10 @@
 import json
 import os
 import sys
+
 from aldryn_client import forms
 
+
 SYSTEM_FIELD_WARNING = 'WARNING: this field is auto-written. Please do not change it here.'
 
 
@@ -223,6 +225,8 @@ class Form(forms.BaseForm):
         return settings
 
     def domain_settings(self, data, settings, env):
+        from aldryn_addons.utils import boolean_ish
+
         settings['ALLOWED_HOSTS'] = env('ALLOWED_HOSTS', ['localhost', '*'])
         # will take a full config dict from ALDRYN_SITES_DOMAINS if available,
         # otherwise fall back to constructing the dict from DOMAIN,
@@ -232,6 +236,8 @@ class Form(forms.BaseForm):
             settings['DOMAIN'] = domain
 
         domains = env('ALDRYN_SITES_DOMAINS', {})
+        permanent_redirect = boolean_ish(env('ALDRYN_SITES_REDIRECT_PERMANENT', False))
+
         if not domains and domain:
             domain_aliases = [
                 d.strip()
@@ -252,6 +258,7 @@ class Form(forms.BaseForm):
                 },
             }
         settings['ALDRYN_SITES_DOMAINS'] = domains
+        settings['ALDRYN_SITES_REDIRECT_PERMANENT'] = permanent_redirect
 
         # This is ensured again by aldryn-sites, but we already do it here
         # as we need the full list of domains later when configuring

addons/aldryn-django/settings.json

@@ -1,7 +1,7 @@
 {
-    "disable_default_language_prefix": false, 
-    "enable_gis": false, 
-    "languages": "[\"de\", \"en\"]", 
-    "session_timeout": "", 
+    "disable_default_language_prefix": false,
+    "enable_gis": false,
+    "languages": "[\"de\", \"en\"]",
+    "session_timeout": "",
     "use_manifeststaticfilesstorage": true
 }