diff --git a/Directory.Packages.props b/Directory.Packages.props index b503b502d..f348abf3b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,10 +6,10 @@ - + - - + + @@ -18,27 +18,27 @@ - + - - + + - - - - + + + + - - + + - - + + \ No newline at end of file diff --git a/docs/docs/Installation/aws.md b/docs/docs/Installation/aws.md index 3b5b4707f..911aa6957 100644 --- a/docs/docs/Installation/aws.md +++ b/docs/docs/Installation/aws.md @@ -17,7 +17,8 @@ You can modify BaGetter's configurations by editing the `appsettings.json` file. ### Amazon S3 -Update the `appsettings.json` file: +Create a bucket, a service account with access to the bucket, and an access key for the service account. +Update the `appsettings.json` file with those: ```json { diff --git a/docs/docs/Installation/gcp.md b/docs/docs/Installation/gcp.md index a2021d831..262b4b2cb 100644 --- a/docs/docs/Installation/gcp.md +++ b/docs/docs/Installation/gcp.md @@ -25,7 +25,25 @@ Follow the instructions in [Using Cloud Storage](https://cloud.google.com/appeng **NOTE:** If you plan to use AppEngine, skip this part and follow the AppEngine instructions below. -Set up a service account and download credentials. Set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to the path to the JSON file you downloaded. +Set up a service account, create and download a key as JSON file. Set the [`GOOGLE_APPLICATION_CREDENTIALS`](https://cloud.google.com/docs/authentication/provide-credentials-adc#wlif-key) +environment variable to the path to the JSON file you downloaded. The file should contain something like this: + +```json +{ + "type": "service_account", + "project_id": "your_project", + "private_key_id": "6950mvh3690mg3h90jg3986vgm", + "private_key": "-----BEGIN PRIVATE KEY-----\hriv eohgrup4nhg8594nhvpog59p4w5...", + "client_email": "your-service-account@your_project.iam.gserviceaccount.com", + "client_id": "49826518658461496", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/your-service-account%40your_project.iam.gserviceaccount.com", + "universe_domain": "googleapis.com" +} + +``` Configure BaGetter to use Google Cloud Storage by updating the `appsettings.json` file: @@ -42,9 +60,11 @@ Configure BaGetter to use Google Cloud Storage by updating the `appsettings.json } ``` +Or set the `Storage__Type` and `Storage__BucketName` environment variables in your deployment (i.e. AppEngine project) accordingly. + ## Google Cloud SQL -- Follow the instructions in [Using Cloud SQL](https://cloud.google.com/appengine/docs/flexible/dotnet/using-cloud-sql) to create a 2nd Gen MySQL 5.7 Google Cloud SQL instance. The default options should work well. +- Follow the instructions in [Using Cloud SQL](https://cloud.google.com/appengine/docs/flexible/dotnet/using-cloud-sql) to create a (for example) 2nd Gen MySQL 5.7 Google Cloud SQL instance. The default options should work well. - Create a database named `bagetter`. This can be done through the Google Cloud Console. Use `utf8mb4` as the Character set. - Follow [Configuring SSL/TLS](https://cloud.google.com/sql/docs/mysql/configure-ssl-instance#new-client) to create a client certificate. Download the three files it creates. - Convert the PEM to a PFX by running `openssl pkcs12 -inkey client-key.pem -in client-cert.pem -export -out client.pfx`