migrated settings and url changes from dev to production to support p…

…ublic frontend

dalme/settings.py

@@ -41,13 +41,29 @@
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'haystack',
-    'djangosaml2idp',
     'django_celery_results',
+    'djangosaml2idp',
+    'corsheaders',
     'rest_framework',
-    'storages'
     'storages',
-
+    'django_filters',
+    'modelcluster',
+    'taggit',
     'maintenance_mode',
+    'wagtail.contrib.forms',
+    'wagtail.contrib.redirects',
+    'wagtail.contrib.routable_page',
+    'wagtail.contrib.styleguide',
+    'wagtail.embeds',
+    'wagtail.sites',
+    'wagtail.users',
+    'wagtail.snippets',
+    'wagtail.documents',
+    'wagtail.images',
+    'wagtail.search',
+    'wagtail.admin',
+    'wagtail.core',
+    'wagtailmodelchooser',
     'dalme_app.application.DalmeConfig',
     'dalme_public.application.DalmePublicConfig',
 ]
@@ -64,6 +80,8 @@
     'dalme_app.utils.AsyncMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'maintenance_mode.middleware.MaintenanceModeMiddleware',
+    'wagtail.core.middleware.SiteMiddleware',
+    'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 ]
 
 ROOT_URLCONF = 'dalme.urls'
@@ -79,6 +97,8 @@
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'dalme_public.context_processors.year',
+                'dalme_public.context_processors.project',
             ],
             'debug': DEBUG,
         },
@@ -90,6 +110,7 @@
 AUTHENTICATION_BACKENDS = [
     'django.contrib.auth.backends.ModelBackend',
 ]
+
 AUTH_PASSWORD_VALIDATORS = [
     {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', },
     {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', },
@@ -138,6 +159,7 @@
 }
 
 DATABASE_ROUTERS = ['dalme_app.utils.ModelDatabaseRouter']
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
@@ -219,6 +241,8 @@
 STATIC_ROOT = os.path.join(BASE_DIR, "www", 'static')
 
 SITE_ID = 1
+WAGTAIL_SITE_NAME = 'DALME'
+WAGTAILIMAGES_IMAGE_MODEL = 'dalme_public.DALMEImage'
 
 SECURE_SSL_REDIRECT = True
 SESSION_COOKIE_SECURE = True

dalme/urls.py

@@ -6,8 +6,12 @@
 from django.contrib.auth import views as auth_views
 from django.http import HttpResponse
 from rest_framework import routers
+from wagtail.admin import urls as wagtailadmin_urls
+from wagtail.core import urls as wagtail_urls
+from wagtail.documents import urls as wagtaildocs_urls
 from dalme_app import apis
 from dalme_app import web_apis
+from dalme_public import urls as dalme_public_urls
 from maintenance_mode import urls as maintenance_mode_urls
 
 router = routers.DefaultRouter()
@@ -45,11 +49,16 @@
     path('maintenance-mode/', include(maintenance_mode_urls)),
     path('api/', include(router.urls)),
     path('web-api/', include(web_router.urls)),
+    path('api/public/', include(dalme_public_urls)),
     path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),
     path('accounts/', include('django.contrib.auth.urls')),
     path('idp/', include('djangosaml2idp.urls', namespace='identity_provider')),
     path('logout/', auth_views.LogoutView.as_view(), name='logout'),
     path('django_admin/', admin.site.urls),
     re_path(r'^\.well-known/acme-challenge/DWY9GSDZjOsijpklS3RIAuBvZt2PThO7ameePcaIHm8/', lambda request: HttpResponse('DWY9GSDZjOsijpklS3RIAuBvZt2PThO7ameePcaIHm8.LbUmj5n5DqTPM7bapjsa-DennAErlpafYkGP-9eZzzo'), name='hello_world'),
     re_path(r'^', include('dalme_app.urls')),
+    # Public URLs. Wagtail didn't like being namespaced so leave at top-level for now.
+    path('cms/', include(wagtailadmin_urls)),
+    path('public/', include(wagtail_urls)),
+    path('documents/', include(wagtaildocs_urls)),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)