From 0f93585ceb65259d62a33cdf45a718588bf618c2 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Fri, 6 Feb 2015 16:16:46 -0800 Subject: [PATCH] re-add github support --- Makefile | 3 ++- app.yaml | 7 ++++++- nginx.conf | 7 ------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 83dcce1..b499a05 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ GIT_REV=`git rev-parse HEAD` +GITHUB_TOKEN=`cat ~/.token` .PHONY: build test oleg @@ -11,4 +12,4 @@ oleg: test: build @echo "http://127.0.0.1:5000" @echo "press ^C to kill the test server" - docker run -p 5000:5000 --name site-$(GIT_REV) --link site-olegdb:oleg --rm -it -e GIT_REV=$(GIT_REV) xena/site /bin/bash + docker run -p 5000:5000 --name site-$(GIT_REV) --link site-olegdb:oleg --rm -it -e GIT_REV=$(GIT_REV) -e GITHUB_TOKEN=$(GITHUB_TOKEN) xena/site /bin/bash diff --git a/app.yaml b/app.yaml index 3fb9c53..af23942 100644 --- a/app.yaml +++ b/app.yaml @@ -3,7 +3,12 @@ name: "christine" overlay: - apt-get update - apt-get install -y lua-sec + - apt-get install -y lua-discount dependencies: - - https://rocks.moonscript.org/manifests/luarocks/markdown-0.32-2.rockspec - https://rocks.moonscript.org/manifests/dhkolf/dkjson-2.5-1.rockspec + - https://rocks.moonscript.org/manifests/leafo/lapis-1.1.0-1.rockspec + - https://rocks.moonscript.org/manifests/luarocks/luasocket-3.0rc1-1.rockspec + - https://github.com/lusis/lua-httpclient/blob/master/httpclient-0.1.0-7.rockspec + - https://raw.githubusercontent.com/lusis/lua-github/master/github-0.0.2-1.rockspec + - https://rocks.moonscript.org/manifests/luarocks/lbase64-20120820-1.rockspec diff --git a/nginx.conf b/nginx.conf index d0bbe53..f5d2837 100644 --- a/nginx.conf +++ b/nginx.conf @@ -49,13 +49,6 @@ http { alias static/keybase.txt; } - location /capture { - internal; - resolver 8.8.8.8; - set_unescape_uri $clean_url $arg_url; - proxy_pass $clean_url; - } - location /proxy { internal; rewrite_by_lua "