From c655c2a6904dbc4fe8b0d9d7c552c57ee0c8439e Mon Sep 17 00:00:00 2001 From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch> Date: Wed, 5 May 2021 10:41:55 +0200 Subject: [PATCH] Revert "Merge branch '8.9.13-filelog' into '8.9.13'" This reverts commit 1d6ef38a495f834374701fc70b21fb8543f5dc9c, reversing changes made to fe506263fc6ebc5a18698d6c779c114f4850217d. --- composer.json | 1 - composer.lock | 54 +------------------ vendor/composer/LICENSE | 2 - vendor/composer/installed.json | 54 ------------------- web/profiles/cern/cern.info.yml | 1 - .../cern/config/install/filelog.settings.yml | 11 ---- 6 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 web/profiles/cern/config/install/filelog.settings.yml diff --git a/composer.json b/composer.json index 991a67e5c..8a8b6dd17 100644 --- a/composer.json +++ b/composer.json @@ -135,7 +135,6 @@ "drupal/field_group": "^3.1", "drupal/field_permissions": "^1.1", "drupal/filefield_paths": "^1.0@beta", - "drupal/filelog": "^2.0", "drupal/honeypot": "^1.30", "drupal/hook_event_dispatcher": "^1.29", "drupal/hotjar": "^2.0", diff --git a/composer.lock b/composer.lock index 2ddde79a9..ec49e4692 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": "0815b52c5ba8616d769f471ae5f9d0f7", + "content-hash": "c1cd9f8ce2950e1fffef7dba9f1852a3", "packages": [ { "name": "asm89/stack-cors", @@ -4460,58 +4460,6 @@ "source": "https://git.drupalcode.org/project/filefield_paths" } }, - { - "name": "drupal/filelog", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/filelog.git", - "reference": "2.0.1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/filelog-2.0.1.zip", - "reference": "2.0.1", - "shasum": "b02a3557a4c59bfa48582c54db062de9c7805721" - }, - "require": { - "drupal/core": "^8.8 | ^9", - "ext-zlib": "*", - "php": "^7.1" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.0.1", - "datestamp": "1592209031", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Christoph Burschka", - "homepage": "https://github.com/cburschka", - "email": "christoph@burschka.de", - "role": "Maintainer" - } - ], - "description": "Logs system events to a file.", - "homepage": "https://www.drupal.org/project/filelog", - "keywords": [ - "Drupal" - ], - "support": { - "source": "http://cgit.drupalcode.org/filelog", - "issues": "https://www.drupal.org/project/issues/filelog" - } - }, { "name": "drupal/honeypot", "version": "1.30.0", diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE index f27399a04..62ecfd8d0 100644 --- a/vendor/composer/LICENSE +++ b/vendor/composer/LICENSE @@ -1,4 +1,3 @@ - Copyright (c) Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy @@ -18,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 4ff36b04f..90a6672e2 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -4600,60 +4600,6 @@ "source": "https://git.drupalcode.org/project/filefield_paths" } }, - { - "name": "drupal/filelog", - "version": "2.0.1", - "version_normalized": "2.0.1.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/filelog.git", - "reference": "2.0.1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/filelog-2.0.1.zip", - "reference": "2.0.1", - "shasum": "b02a3557a4c59bfa48582c54db062de9c7805721" - }, - "require": { - "drupal/core": "^8.8 | ^9", - "ext-zlib": "*", - "php": "^7.1" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.0.1", - "datestamp": "1592209031", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "installation-source": "dist", - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Christoph Burschka", - "homepage": "https://github.com/cburschka", - "email": "christoph@burschka.de", - "role": "Maintainer" - } - ], - "description": "Logs system events to a file.", - "homepage": "https://www.drupal.org/project/filelog", - "keywords": [ - "Drupal" - ], - "support": { - "source": "http://cgit.drupalcode.org/filelog", - "issues": "https://www.drupal.org/project/issues/filelog" - } - }, { "name": "drupal/honeypot", "version": "1.30.0", diff --git a/web/profiles/cern/cern.info.yml b/web/profiles/cern/cern.info.yml index 94492dd8f..df96308c3 100644 --- a/web/profiles/cern/cern.info.yml +++ b/web/profiles/cern/cern.info.yml @@ -27,7 +27,6 @@ dependencies: - externalauth - field_ui - file - - filelog - help - history - image diff --git a/web/profiles/cern/config/install/filelog.settings.yml b/web/profiles/cern/config/install/filelog.settings.yml deleted file mode 100644 index 6b7911c84..000000000 --- a/web/profiles/cern/config/install/filelog.settings.yml +++ /dev/null @@ -1,11 +0,0 @@ -enabled: true -location: '/drupal-data' -rotation: - schedule: never - delete: false - destination: 'archive/[date:custom:Y/m/d].log' - gzip: true -format: '[[log:created]] [[log:level]] [[log:channel]] [client: [log:ip], [log:user]] [log:message]' -level: 7 -channels_type: exclude -channels: [] -- GitLab