yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into list-not-loading

Browse Source
This commit is contained in:
Mouse Reeve
2021-12-30 10:44:23 -08:00
parent 906e0c9c7c f993195752
commit 975ef7d38e
96 changed files with 5890 additions and 3044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bw-dev
View File

@ -130,8 +130,11 @@ case "$CMD" in
black)
makeitblack
;;
prettier)
npx prettier --write bookwyrm/static/js/*.js
;;
populate_streams)
runweb python manage.py populate_streams $@
runweb python manage.py populate_streams "$@"
;;
populate_lists_streams)
runweb python manage.py populate_lists_streams $@
@ -143,20 +146,33 @@ case "$CMD" in
runweb python manage.py generateimages
;;
generate_preview_images)
runweb python manage.py generate_preview_images $@
runweb python manage.py generate_preview_images "$@"
;;
copy_media_to_s3)
awscommand "bookwyrm_media_volume:/images"\
"s3 cp /images s3://${AWS_STORAGE_BUCKET_NAME}/images\
--endpoint-url ${AWS_S3_ENDPOINT_URL}\
--recursive --acl public-read"
--recursive --acl public-read" "$@"
;;
sync_media_to_s3)
awscommand "bookwyrm_media_volume:/images"\
"s3 sync /images s3://${AWS_STORAGE_BUCKET_NAME}/images\
--endpoint-url ${AWS_S3_ENDPOINT_URL}\
--acl public-read" "$@"
;;
set_cors_to_s3)
set +x
config_file=$1
if [ -z "$config_file" ]; then
echo "This command requires a JSON file containing a CORS configuration as an argument"
exit 1
fi
set -x
awscommand "$(pwd):/bw"\
"s3api put-bucket-cors\
--bucket ${AWS_STORAGE_BUCKET_NAME}\
--endpoint-url ${AWS_S3_ENDPOINT_URL}\
--cors-configuration file:///bw/$@"
--cors-configuration file:///bw/$config_file" "$@"
;;
runweb)
runweb "$@"
@ -187,6 +203,7 @@ case "$CMD" in
echo " generate_thumbnails"
echo " generate_preview_images [--all]"
echo " copy_media_to_s3"
echo " sync_media_to_s3"
echo " set_cors_to_s3 [cors file]"
echo " runweb [command]"
;;