Merge branch 'release/1.4.2'

dynamicweb/settings.py

@@ -88,6 +88,7 @@ INSTALLED_APPS = (
     'ungleich',
     'railshosting',
     'digitalglarus',
+    'djangocms_page_meta',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -410,6 +411,14 @@ BLOG_POSTS_LIST_TRUNCWORDS_COUNT = 100
 BLOG_MULTISITE = True
 BLOG_AUTHOR_DEFAULT = True
 
+#django-meta
+META_SITE_PROTOCOL = "https"
+META_SITE_DOMAIN = "ungleich.ch"
+META_SITE_TYPE = "website"
+META_SITE_NAME = "ungleich"
+META_INCLUDE_KEYWORDS = ["ungleich", "hosting", "switzerland", "Schweiz", "Swiss", "cdist"]
+META_USE_SITES = True
+
 try:
     from .local.local_settings import *
 except ImportError as e:

requirements.txt

@@ -50,3 +50,6 @@ circus-web
 chaussette
 meinheld
 gevent
+
+# djangocms-page-meta
+djangocms-page-meta

templates/cms/ungleich.ch/base.html

@@ -29,6 +29,7 @@
     {% endaddtoblock %}
     <meta charset="UTF-8">
     <meta name="description" content="{% page_attribute 'meta_description' %}">
+    {% include 'meta.html' %}
     {% block meta %}
     {% endblock %}
     {% render_block "external-css" %}