Merge branch 'master' of https://github.com/vitusventure/5thSRD

vitusventure · Apr 24, 2021 · cef9fb0 · cef9fb0
2 parents e4b74de + e813a47
commit cef9fb0
Show file tree

Hide file tree

Showing 4 changed files with 493 additions and 8 deletions.
diff --git a/build_to_test.sh b/build_to_test.sh
@@ -2,7 +2,7 @@
 
 git pull
 
-python3 build_indexes.py
+poetry run python ./build_indexes.py
 
 mkdocs build --clean
 

diff --git a/deploy_to_prod.sh b/deploy_to_prod.sh
@@ -4,13 +4,13 @@
 git pull
 
 # Generate offline indexes
-python3 build_indexes.py --offline
+poetry run python ./build_indexes.py --offline
 
 # Build the offline site
 mkdocs build --clean --config-file offline_build_config.yml
 
 # Generate regular indexes
-python3 build_indexes.py
+poetry run python ./build_indexes.py
 
 # Build the site
 mkdocs build --clean
@@ -22,8 +22,3 @@ mv /tmp/5thsrd_offline.zip ./site/
 
 # Sync to S3
 aws s3 sync ./site/ s3://5thsrd.org/ --region="us-east-1" --delete
-
-# Set Cache-Control on static resources
-s3cmd modify --recursive s3://5thsrd.org/css/ --add-header=Cache-Control:max-age=604800 -v
-s3cmd modify --recursive s3://5thsrd.org/js/ --add-header=Cache-Control:max-age=604800 -v
-s3cmd modify --recursive s3://5thsrd.org/img/ --add-header=Cache-Control:max-age=604800 -v