Merge branch 'develop' into staging

OS2web · Aug 25, 2021 · 268b613 · 268b613
2 parents 3890960 + bc22b97
commit 268b613
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 1 deletion.
diff --git a/.docker/os2web/apache/000-default.conf b/.docker/os2web/apache/000-default.conf
@@ -20,6 +20,9 @@
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
+	# Enable HTTPS if reverve proxy is using HTTPS
+	SetEnvIf X-Forwarded-Proto https HTTPS=on
+
 	php_admin_value open_basedir /opt/drupal:/usr/share/php
 	php_value include_path .:/opt/drupal
 

diff --git a/composer.json b/composer.json
@@ -78,6 +78,7 @@
         "os2web/os2web_news": "dev-master",
         "os2web/os2web_pagebuilder": "dev-master",
         "os2web/os2web_person_information": "dev-master",
+        "os2web/os2web_rest_api": "^0.0.1",
         "os2web/os2web_search": "dev-master",
         "os2web/os2web_spotbox": "dev-master",
         "vlucas/phpdotenv": "^4.0",

diff --git a/composer.lock b/composer.lock