update to support multibucket changes
Change-Id: Ib254b1ff1df80a6b298a0f8bee40983268ba92e9
diff --git a/README.md b/README.md
index 6473447..6be9688 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
This repository uses [Zappa](https://github.com/Miserlou/Zappa),
-[TuxPut](https://gitlab.com/kspoon-linaro/tuxput), and pipenv to deploy an
+[TuxPut](https://gitlab.com/Linaro/tuxput), and pipenv to deploy an
upload server to S3!
## Installing
@@ -8,7 +8,7 @@
```
$ pipenv install zappa
-$ pipenv install -e git+ssh://git@gitlab.com/kspoon-linaro/tuxput.git@master#egg=tuxput
+$ pipenv install -e git+ssh://git@gitlab.com/Linaro/tuxput.git@master#egg=tuxput
```
## Updating
@@ -32,7 +32,7 @@
## Running Locally
```
-$ S3_BUCKET=testing-tuxpub.ctt.linaro.org S3_REGION=us-east-1 S3_ROOT=projects FLASK_APP=tuxput pipenv run flask run
+$ CONF_BUCKET=testing-tuxpub-auth S3_REGION=us-east-1 FLASK_APP=tuxput pipenv run flask run
```
diff --git a/sample-tuxput.json b/sample-tuxput.json
new file mode 100644
index 0000000..0e4623f
--- /dev/null
+++ b/sample-tuxput.json
@@ -0,0 +1,49 @@
+{
+ "buckets": [
+ {"name": "testing-tuxput",
+ "offset": "projects"
+ },
+ {"name": "testing-tuxput-auth"},
+ {"name": "testing-tuxput-extra",
+ "offset": "files/public"
+ }
+ ],
+ "users": [
+ {"user":"testguy",
+ "token": "seekrit",
+ "authorizations": [
+ {"bucket": "testing-tuxput",
+ "restricted_path": "*"
+ },
+ {
+ "bucket": "testing-tuxput-extra",
+ "restricted_path": "projects/*/user"
+ }
+ ]
+ },
+ {"user":"build1user",
+ "token": "a1token",
+ "authorizations": [
+ {"bucket": "testing-tuxput*",
+ "restricted_path": "build1/*"
+ },
+ {
+ "bucket": "testing-tuxput-extra",
+ "restricted_path": "build1*"
+ }
+ ]
+ },
+ {"user":"testuser2",
+ "token": "a2token",
+ "authorizations": [
+ {"bucket": "testing-tuxput",
+ "restricted_path": "build2/*"
+ },
+ {
+ "bucket": "testing-tuxput-extra",
+ "restricted_path": "projects/contrib/*"
+ }
+ ]
+ }
+ ]
+}
diff --git a/zappa_settings.yml b/zappa_settings.yml
index 3cc80d9..eb6865a 100644
--- a/zappa_settings.yml
+++ b/zappa_settings.yml
@@ -9,6 +9,6 @@
certificate_arn: arn:aws:acm:us-east-1:987685672616:certificate/888711a3-2023-4c5b-9861-e6713ca56060
environment_variables:
ALLOW_UPLOAD_OVERWRITE: "True"
- S3_BUCKET: trustedfirmware-prod-storage
+ CONF_BUCKET: tuxput-trustedfirmware-org
+ DEFAULT_BUCKET: trustedfirmware-prod-storage
S3_REGION: us-east-1
- AUTH_BUCKET: tuxput-trustedfirmware-org