Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop AWS.

Browse Source
This commit is contained in:
ccd0 2016-05-03 20:44:45 -07:00
parent 8b63b22be0
commit aa4bab6c3b
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -25,7 +25,7 @@ coffee_deps := node_modules/coffee-script/package.json
template := node tools/template.js template := node tools/template.js
template_deps := package.json tools/template.js node_modules/lodash.template/package.json node_modules/esprima/package.json template_deps := package.json tools/template.js node_modules/lodash.template/package.json node_modules/esprima/package.json
# read name meta_name meta_distBranch meta_awsBucket # read name meta_name meta_distBranch meta_uploadPath
$(eval $(shell node tools/pkgvars.js)) $(eval $(shell node tools/pkgvars.js))
# must be read in when needed to prevent out-of-date version # must be read in when needed to prevent out-of-date version
@ -254,13 +254,7 @@ distready : dist $(wildcard dist/* dist/*/*)
echo -> $@ echo -> $@
.events2/push-web : .git/refs/heads/$(meta_distBranch) | .events2 distready .events2/push-web : .git/refs/heads/$(meta_distBranch) | .events2 distready
aws s3 cp dist/builds/ s3://$(meta_awsBucket)/builds/ --recursive --exclude "*" --include "*.js" --cache-control "max-age=600" --content-type "application/javascript; charset=utf-8" git push web $(meta_distBranch)
aws s3 cp dist/builds/ s3://$(meta_awsBucket)/builds/ --recursive --exclude "*" --include "*.crx" --cache-control "max-age=600" --content-type "application/x-chrome-extension"
aws s3 cp dist/builds/ s3://$(meta_awsBucket)/builds/ --recursive --exclude "*" --include "*.xml" --cache-control "max-age=600" --content-type "text/xml; charset=utf-8"
aws s3 cp dist/builds/ s3://$(meta_awsBucket)/builds/ --recursive --exclude "*" --include "*.zip" --cache-control "max-age=600" --content-type "application/zip"
aws s3 cp dist/img/ s3://$(meta_awsBucket)/img/ --recursive --cache-control "max-age=600"
aws s3 cp dist/index.html s3://$(meta_awsBucket) --cache-control "max-age=600" --content-type "text/html; charset=utf-8"
aws s3 cp dist/web.css s3://$(meta_awsBucket) --cache-control "max-age=600" --content-type "text/css; charset=utf-8"
echo -> $@ echo -> $@
.events2/push-store : .git/refs/tags/stable | .events2 distready node_modules/webstore-upload/package.json .events2/push-store : .git/refs/tags/stable | .events2 distready node_modules/webstore-upload/package.json
@ -285,7 +279,7 @@ push : .events2/push-git .events2/push-web .events2/push-store
captchas : redirect.html $(template_deps) captchas : redirect.html $(template_deps)
$(template) redirect.html captchas.html url="$(url)" $(template) redirect.html captchas.html url="$(url)"
aws s3 cp captchas.html s3://$(meta_awsBucket) --cache-control "max-age=0" --content-type "text/html; charset=utf-8" scp captchas.html $(meta_uploadPath)
clean : clean :
$(RMDIR) tmp testbuilds .events $(RMDIR) tmp testbuilds .events

2
package.json
View File

@ -18,7 +18,7 @@
"recaptchaKey": "6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc", "recaptchaKey": "6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc",
"youtubeAPIKey": "AIzaSyB5_zaen_-46Uhz1xGR-lz1YoUMHqCD6CE", "youtubeAPIKey": "AIzaSyB5_zaen_-46Uhz1xGR-lz1YoUMHqCD6CE",
"distBranch": "gh-pages", "distBranch": "gh-pages",
"awsBucket": "4chan-x", "uploadPath": "www.4chan-x.net:/var/www/html/",
"matches": [ "matches": [
"*://boards.4chan.org/*", "*://boards.4chan.org/*",
"*://sys.4chan.org/*", "*://sys.4chan.org/*",

2
tools/pkgvars.js
View File

@ -6,5 +6,5 @@ console.log(
`$(eval name := ${pkg.name}) `$(eval name := ${pkg.name})
$(eval meta_name := ${pkg.meta.name}) $(eval meta_name := ${pkg.meta.name})
$(eval meta_distBranch := ${pkg.meta.distBranch}) $(eval meta_distBranch := ${pkg.meta.distBranch})
$(eval meta_awsBucket := ${pkg.meta.awsBucket}) $(eval meta_uploadPath := ${pkg.meta.uploadPath})
`); `);