diff --git a/.gitattributes b/.gitattributes index 28fc0f26..9073910f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -26,8 +26,6 @@ js/test/ export-ignore .vscode export-ignore codacy-analysis.yml export-ignore crowdin.yml export-ignore -composer.json export-ignore -composer.lock export-ignore BADGES.md export-ignore CODE_OF_CONDUCT.md export-ignore Makefile export-ignore diff --git a/composer.lock b/composer.lock index 5f8d2963..7a16efdf 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": "96f9b3968855bf9f45813d12568f1cac", + "content-hash": "b76c0c25f93dc79c4525cb3c86e5af99", "packages": [ { "name": "jdenticon/jdenticon", @@ -1930,5 +1930,5 @@ "platform-overrides": { "php": "7.3" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.2.0" } diff --git a/doc/Installation.md b/doc/Installation.md index d24dcbe7..77f79fbb 100644 --- a/doc/Installation.md +++ b/doc/Installation.md @@ -228,7 +228,12 @@ If you want to deploy PrivateBin in a serverless manner in the Google Cloud, you can choose the `GoogleCloudStorage` as backend. To use this backend, you first have to install the SDK from the installation -directory of PrivateBin: `composer require google/cloud-storage` +directory of PrivateBin: + +```console +composer require --no-update google/cloud-storage +composer update --no-dev --optimize-autoloader +``` You have to create a GCS bucket and specify the name as the model option `bucket`. Alternatively, you can set the name through the environment variable `PRIVATEBIN_GCS_BUCKET`. @@ -246,7 +251,12 @@ the AWS SDK for PHP, but can also talk to a Rados gateway as part of a Ceph cluster. To use this backend, you first have to install the SDK from the installation -directory of PrivateBin: `composer require aws/aws-sdk-php` +directory of PrivateBin: + +```console +composer require --no-update aws/aws-sdk-php +composer update --no-dev --optimize-autoloader +``` You have to create an S3 bucket on the Ceph cluster before using the S3 backend.