From 86697417f81553634b67b68b80b4736bb4bb7b73 Mon Sep 17 00:00:00 2001 From: andriyun Date: Tue, 24 Aug 2021 14:42:17 +0200 Subject: [PATCH 1/2] Added os2web_rest_api module --- composer.json | 1 + composer.lock | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 371514d6d..2380d945a 100644 --- 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 index 459cba769..0744bf302 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "47f69c41b4c3f8e6a15adc8bdd5ae493", + "content-hash": "30526c913ef9f518ec192ee05889d7af", "packages": [ { "name": "alchemy/zippy", @@ -7242,6 +7242,62 @@ "source": "https://git.drupalcode.org/project/redirect_after_login" } }, + { + "name": "drupal/restui", + "version": "1.20.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/restui.git", + "reference": "8.x-1.20" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/restui-8.x-1.20.zip", + "reference": "8.x-1.20", + "shasum": "df1d3c486ee0e7b4e9a24e6523a69c9efe73caff" + }, + "require": { + "drupal/core": "^8.7.7 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.20", + "datestamp": "1616839543", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "-enzo-", + "homepage": "https://www.drupal.org/user/294937" + }, + { + "name": "clemens.tolboom", + "homepage": "https://www.drupal.org/user/125814" + }, + { + "name": "juampynr", + "homepage": "https://www.drupal.org/user/682736" + }, + { + "name": "klausi", + "homepage": "https://www.drupal.org/user/262198" + } + ], + "description": "Provides a user interface to manage REST resources.", + "homepage": "https://www.drupal.org/project/restui", + "support": { + "source": "https://git.drupalcode.org/project/restui" + } + }, { "name": "drupal/rules", "version": "3.0.0-alpha6", @@ -11788,6 +11844,36 @@ "description": "OS2Web person information", "time": "2021-06-04T13:53:46+00:00" }, + { + "name": "os2web/os2web_rest_api", + "version": "0.0.1", + "source": { + "type": "git", + "url": "https://github.com/OS2web/os2web_rest_api.git", + "reference": "68f8361d2612fc8ffcaa28abb49bff91ff0eee43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/OS2web/os2web_rest_api/zipball/68f8361d2612fc8ffcaa28abb49bff91ff0eee43", + "reference": "68f8361d2612fc8ffcaa28abb49bff91ff0eee43", + "shasum": "" + }, + "require": { + "drupal/core": "*", + "drupal/restui": "*" + }, + "type": "drupal-module", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "EUPL-1.2" + ], + "description": "OS2Web Rest API", + "support": { + "issues": "https://github.com/OS2web/os2web_rest_api/issues", + "source": "https://github.com/OS2web/os2web_rest_api/tree/0.0.1" + }, + "time": "2021-08-24T12:33:47+00:00" + }, { "name": "os2web/os2web_search", "version": "dev-master", From bc22b97911fa57096f265209280ea580f15b5654 Mon Sep 17 00:00:00 2001 From: andriyun Date: Wed, 25 Aug 2021 15:35:27 +0200 Subject: [PATCH 2/2] Added HTTPS fix where using reverse proxy --- .docker/os2web/apache/000-default.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.docker/os2web/apache/000-default.conf b/.docker/os2web/apache/000-default.conf index 8d5519907..c6c9cd9c8 100644 --- 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