diff --git a/.awsbox.json b/.awsbox.json index 81feaa18fb0d95f4811a93e3e43c1a81af405cad..7385f29b10756859f55bdcbec5ac0ca49fbdeec4 100644 --- a/.awsbox.json +++ b/.awsbox.json @@ -12,7 +12,7 @@ "CONFIG_FILES": "$HOME/code/config/production.json,$HOME/code/config/aws.json,$HOME/config.json" }, "hooks": { - "postdeploy": "scripts/awsbox/post_deploy.js", + "postdeploy": "scripts/awsbox/post_deploy.sh", "poststart": "scripts/show_config.js", "postcreate": "scripts/awsbox/post_create.sh" }, diff --git a/package.json b/package.json index 82327586b043930903d40e55d5e0d17f6e25c564..ec75feafb4fe54bc00124de0d5c0aeea689f0498 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "vows": "0.5.13", - "awsbox": "0.2.12", + "awsbox": "0.2.15", "irc": "0.3.3", "jshint": "0.7.1" }, @@ -48,6 +48,6 @@ "start": "node ./scripts/run_locally.js" }, "engines": { - "node": ">= 0.6.7" + "node": ">= 0.6.17" } } diff --git a/scripts/awsbox/post_create.sh b/scripts/awsbox/post_create.sh index 33e1de7b316680ddc4761668af17112d9b75985f..e3e41a58c12a71850729e1c94bbcfec45dfed122 100755 --- a/scripts/awsbox/post_create.sh +++ b/scripts/awsbox/post_create.sh @@ -3,7 +3,6 @@ sudo /sbin/chkconfig mysqld on sudo /sbin/service mysqld start sudo mysql -u root < $(dirname "${BASH_SOURCE[0]}")/create_browserid_user.sql -echo "CREATE USER 'browserid'@'localhost';" | mysql -u root +echo "CREATE USER 'browserid'@'localhost';" | mysql -u root echo "CREATE DATABASE browserid;" | mysql -u root echo "GRANT ALL ON browserid.* TO 'browserid'@'localhost';" | mysql -u root - diff --git a/scripts/awsbox/post_deploy.js b/scripts/awsbox/post_deploy.js deleted file mode 100755 index fab019420ce86b7cb7df1019dcc08f337ee2146f..0000000000000000000000000000000000000000 --- a/scripts/awsbox/post_deploy.js +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -if [ ! -f $HOME/var/root.cert ] ; then - echo ">> generating keypair" - scripts/generate_ephemeral_keys.js - mv var/root.{cert,secretkey} $HOME/var -else - echo ">> no keypair needed. you gots one" -fi - -#echo ">> updating strings" -#svn co -q http://svn.mozilla.org/projects/l10n-misc/trunk/browserid/locale -#cd locale -#svn up -#cd .. -#./scripts/extract_po.sh locale/ -## yuck! our debug language breaks if this is not present -#for file in locale/templates/LC_MESSAGES/*.pot ; do -# mv $file $file.old -# sed 's/CHARSET/UTF-8/g' $file.old > $file -# rm -f $file.old -#done -# -#./scripts/merge_po.sh locale/ -#./locale/compile-mo.sh locale/ -#./locale/compile-json.sh locale/ resources/static/i18n/ - -echo ">> generating production resources" -scripts/compress diff --git a/scripts/awsbox/post_deploy.sh b/scripts/awsbox/post_deploy.sh new file mode 100755 index 0000000000000000000000000000000000000000..766cc41a06822f9d9a07f9661997867e55dcc657 --- /dev/null +++ b/scripts/awsbox/post_deploy.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +if [ ! -f $HOME/var/root.cert ] ; then + echo ">> generating keypair" + scripts/generate_ephemeral_keys.js + mv var/root.{cert,secretkey} $HOME/var +else + echo ">> no keypair needed. you gots one" +fi + +echo ">> generating production resources" +scripts/compress