diff --git a/Makefile b/Makefile index d108d80b2..042cfddce 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ coffee_deps := node_modules/coffee-script/package.json template := node tools/template.js 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)) # must be read in when needed to prevent out-of-date version @@ -254,13 +254,7 @@ distready : dist $(wildcard dist/* dist/*/*) echo -> $@ .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" - 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" + git push web $(meta_distBranch) echo -> $@ .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) $(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 : $(RMDIR) tmp testbuilds .events diff --git a/package.json b/package.json index 2074e73ce..a9867bc1d 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "recaptchaKey": "6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc", "youtubeAPIKey": "AIzaSyB5_zaen_-46Uhz1xGR-lz1YoUMHqCD6CE", "distBranch": "gh-pages", - "awsBucket": "4chan-x", + "uploadPath": "www.4chan-x.net:/var/www/html/", "matches": [ "*://boards.4chan.org/*", "*://sys.4chan.org/*", diff --git a/tools/pkgvars.js b/tools/pkgvars.js index bf8a9e654..811cf7308 100644 --- a/tools/pkgvars.js +++ b/tools/pkgvars.js @@ -6,5 +6,5 @@ console.log( `$(eval name := ${pkg.name}) $(eval meta_name := ${pkg.meta.name}) $(eval meta_distBranch := ${pkg.meta.distBranch}) -$(eval meta_awsBucket := ${pkg.meta.awsBucket}) +$(eval meta_uploadPath := ${pkg.meta.uploadPath}) `);