From 53f77288067e50aa8cf8e50357720caf1abd635e Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Wed, 11 Jan 2017 13:10:39 -0600 Subject: [PATCH] Integrate basic admin interface, and fix issue creating blank git repositories. --- .sandstorm/launcher.sh | 3 + .sandstorm/sandstorm-files.list | 324 +++++++++++++++++++++++++++++- .sandstorm/sandstorm-pkgdef.capnp | 10 +- .sandstorm/setup.sh | 10 +- Caddyfile | 6 + package.json | 1 + routes.js | 8 + views/index.jade | 1 + 8 files changed, 355 insertions(+), 8 deletions(-) create mode 100644 Caddyfile diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh index e52ea81..06ef28c 100755 --- a/.sandstorm/launcher.sh +++ b/.sandstorm/launcher.sh @@ -9,6 +9,8 @@ if [ ! -e /var/git ]; then git add * echo public >.gitignore git add .gitignore + git config user.name sandstorm + git config user.email sandstorm@localhost git commit -m "Initial commit." git config receive.denyCurrentBranch ignore fi @@ -19,4 +21,5 @@ fi cd /opt/app cp post-receive /var/git/.git/hooks +caddy & NODE_ENV=production HOME=/tmp npm start diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list index 9324e37..d5b4aba 100644 --- a/.sandstorm/sandstorm-files.list +++ b/.sandstorm/sandstorm-files.list @@ -14,7 +14,7 @@ etc/ld.so.cache etc/localtime etc/mailname etc/mime.types -etc/passwd +etc/python2.7/sitecustomize.py etc/ssl/openssl.cnf lib/x86_64-linux-gnu/ld-2.19.so lib/x86_64-linux-gnu/libacl.so.1 @@ -34,6 +34,8 @@ lib/x86_64-linux-gnu/libnsl-2.19.so lib/x86_64-linux-gnu/libnsl.so.1 lib/x86_64-linux-gnu/libnss_compat-2.19.so lib/x86_64-linux-gnu/libnss_compat.so.2 +lib/x86_64-linux-gnu/libnss_dns-2.19.so +lib/x86_64-linux-gnu/libnss_dns.so.2 lib/x86_64-linux-gnu/libnss_files-2.19.so lib/x86_64-linux-gnu/libnss_files.so.2 lib/x86_64-linux-gnu/libnss_nis-2.19.so @@ -49,12 +51,16 @@ lib/x86_64-linux-gnu/librt.so.1 lib/x86_64-linux-gnu/libselinux.so.1 lib/x86_64-linux-gnu/libtinfo.so.5 lib/x86_64-linux-gnu/libtinfo.so.5.9 +lib/x86_64-linux-gnu/libutil-2.19.so +lib/x86_64-linux-gnu/libutil.so.1 lib/x86_64-linux-gnu/libz.so.1 lib/x86_64-linux-gnu/libz.so.1.2.8 lib64/ld-linux-x86-64.so.2 opt/app opt/app/.git/HEAD +opt/app/.git/refs/heads/master opt/app/.sandstorm/launcher.sh +opt/app/Caddyfile opt/app/app.js opt/app/node_modules/accepts/index.js opt/app/node_modules/accepts/package.json @@ -165,6 +171,8 @@ opt/app/node_modules/escape-html/index.js opt/app/node_modules/escape-html/package.json opt/app/node_modules/etag/index.js opt/app/node_modules/etag/package.json +opt/app/node_modules/eventemitter3/index.js +opt/app/node_modules/eventemitter3/package.json opt/app/node_modules/express/index.js opt/app/node_modules/express/lib/application.js opt/app/node_modules/express/lib/express.js @@ -191,6 +199,14 @@ opt/app/node_modules/git-side-band-message/index.js opt/app/node_modules/git-side-band-message/package.json opt/app/node_modules/http-errors/index.js opt/app/node_modules/http-errors/package.json +opt/app/node_modules/http-proxy/index.js +opt/app/node_modules/http-proxy/lib/http-proxy.js +opt/app/node_modules/http-proxy/lib/http-proxy/common.js +opt/app/node_modules/http-proxy/lib/http-proxy/index.js +opt/app/node_modules/http-proxy/lib/http-proxy/passes/web-incoming.js +opt/app/node_modules/http-proxy/lib/http-proxy/passes/web-outgoing.js +opt/app/node_modules/http-proxy/lib/http-proxy/passes/ws-incoming.js +opt/app/node_modules/http-proxy/package.json opt/app/node_modules/inherits/inherits.js opt/app/node_modules/inherits/package.json opt/app/node_modules/ipaddr.js/lib/ipaddr.js @@ -272,6 +288,8 @@ opt/app/node_modules/qs/lib/utils.js opt/app/node_modules/qs/package.json opt/app/node_modules/range-parser/index.js opt/app/node_modules/range-parser/package.json +opt/app/node_modules/requires-port/index.js +opt/app/node_modules/requires-port/package.json opt/app/node_modules/send/index.js opt/app/node_modules/send/package.json opt/app/node_modules/serve-static/index.js @@ -366,6 +384,7 @@ opt/app/package.json opt/app/post-receive opt/app/public/stylesheets/style.css opt/app/routes.js +opt/app/views/error.jade opt/app/views/index.jade opt/app/views/layout.jade opt/app/views/publicId.jade @@ -373,6 +392,7 @@ proc/cpuinfo sandstorm-http-bridge sandstorm-http-bridge-config sandstorm-manifest +usr/bin usr/bin/env usr/bin/git usr/bin/git-receive-pack @@ -381,6 +401,9 @@ usr/bin/hugo usr/bin/node usr/bin/nodejs usr/bin/npm +usr/bin/pygmentize +usr/bin/python +usr/bin/python2.7 usr/lib/git-core/git usr/lib/git-core/git-upload-pack usr/lib/node_modules/npm/bin/npm-cli.js @@ -532,6 +555,53 @@ usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-st usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/package.json usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/node_modules/readable-stream/readable.js usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/concat-stream/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/log.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/node_modules/delegates/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/tracker-base.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/tracker-group.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/tracker-stream.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/are-we-there-yet/tracker.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/console-control-strings/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/console-control-strings/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/base-theme.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/error.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/has-color.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/signal-exit/signals.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/string-width/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/align.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/node_modules/wide-align/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/plumbing.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/process.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/progress-bar.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/render-template.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/set-immediate.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/set-interval.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/spin.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/template-item.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/theme-set.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/themes.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/gauge/wide-truncate.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/set-blocking/index.js +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/node_modules/set-blocking/package.json +usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/npmlog/package.json usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/index.js usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/lib/retry.js usr/lib/node_modules/npm/node_modules/npm-registry-client/node_modules/retry/lib/retry_operation.js @@ -617,6 +687,7 @@ usr/lib/node_modules/npm/node_modules/readable-stream/lib/_stream_passthrough.js usr/lib/node_modules/npm/node_modules/readable-stream/lib/_stream_readable.js usr/lib/node_modules/npm/node_modules/readable-stream/lib/_stream_transform.js usr/lib/node_modules/npm/node_modules/readable-stream/lib/_stream_writable.js +usr/lib/node_modules/npm/node_modules/readable-stream/lib/internal/streams/BufferList.js usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/buffer-shims/index.js usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/buffer-shims/package.json usr/lib/node_modules/npm/node_modules/readable-stream/node_modules/core-util-is/lib/util.js @@ -642,6 +713,9 @@ usr/lib/node_modules/npm/node_modules/request/lib/redirect.js usr/lib/node_modules/npm/node_modules/request/lib/tunnel.js usr/lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/index.js usr/lib/node_modules/npm/node_modules/request/node_modules/aws-sign2/package.json +usr/lib/node_modules/npm/node_modules/request/node_modules/aws4/aws4.js +usr/lib/node_modules/npm/node_modules/request/node_modules/aws4/lru.js +usr/lib/node_modules/npm/node_modules/request/node_modules/aws4/package.json usr/lib/node_modules/npm/node_modules/request/node_modules/bl/bl.js usr/lib/node_modules/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/duplex.js usr/lib/node_modules/npm/node_modules/request/node_modules/bl/node_modules/readable-stream/lib/_stream_duplex.js @@ -668,8 +742,17 @@ usr/lib/node_modules/npm/node_modules/request/node_modules/forever-agent/index.j usr/lib/node_modules/npm/node_modules/request/node_modules/forever-agent/package.json usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/lib/form_data.js usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/lib/populate.js -usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/async/lib/async.js -usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/async/package.json +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/index.js +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/abort.js +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/async.js +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/defer.js +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/iterate.js +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/state.js +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/lib/terminator.js +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/package.json +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/parallel.js +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/serial.js +usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/node_modules/asynckit/serialOrdered.js usr/lib/node_modules/npm/node_modules/request/node_modules/form-data/package.json usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/error.js usr/lib/node_modules/npm/node_modules/request/node_modules/har-validator/lib/index.js @@ -738,17 +821,22 @@ usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_m usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/verror/package.json usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/algs.js +usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/certificate.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/dhe.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/ed-compat.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/errors.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/fingerprint.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/auto.js +usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/openssh-cert.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pem.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs1.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs8.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/rfc4253.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh-private.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh.js +usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509-pem.js +usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509.js +usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/identity.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/index.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/key.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/private-key.js @@ -762,6 +850,8 @@ usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_m usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/lib/ber/writer.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/lib/index.js usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/package.json +usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/assert.js +usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/package.json usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json usr/lib/node_modules/npm/node_modules/request/node_modules/http-signature/package.json usr/lib/node_modules/npm/node_modules/request/node_modules/is-typedarray/index.js @@ -835,9 +925,236 @@ usr/lib/node_modules/npm/node_modules/wrappy/wrappy.js usr/lib/node_modules/npm/node_modules/write-file-atomic/index.js usr/lib/node_modules/npm/node_modules/write-file-atomic/package.json usr/lib/node_modules/npm/package.json +usr/lib/pymodules/python2.7 +usr/lib/pymodules/python2.7/.path +usr/lib/pymodules/python2.7/ndg_httpsclient-0.3.2.egg-info/namespace_packages.txt +usr/lib/pymodules/python2.7/python_debianbts-1.11.egg-info +usr/lib/python2.7 +usr/lib/python2.7/StringIO.py +usr/lib/python2.7/StringIO.pyc +usr/lib/python2.7/UserDict.py +usr/lib/python2.7/UserDict.pyc +usr/lib/python2.7/__future__.py +usr/lib/python2.7/__future__.pyc +usr/lib/python2.7/_abcoll.py +usr/lib/python2.7/_abcoll.pyc +usr/lib/python2.7/_sysconfigdata.py +usr/lib/python2.7/_sysconfigdata.pyc +usr/lib/python2.7/_weakrefset.py +usr/lib/python2.7/_weakrefset.pyc +usr/lib/python2.7/abc.py +usr/lib/python2.7/abc.pyc +usr/lib/python2.7/base64.py +usr/lib/python2.7/base64.pyc +usr/lib/python2.7/calendar.py +usr/lib/python2.7/calendar.pyc +usr/lib/python2.7/codecs.py +usr/lib/python2.7/codecs.pyc +usr/lib/python2.7/collections.py +usr/lib/python2.7/collections.pyc +usr/lib/python2.7/contextlib.py +usr/lib/python2.7/contextlib.pyc +usr/lib/python2.7/copy.py +usr/lib/python2.7/copy.pyc +usr/lib/python2.7/copy_reg.py +usr/lib/python2.7/copy_reg.pyc +usr/lib/python2.7/dist-packages +usr/lib/python2.7/dist-packages/pkg_resources.py +usr/lib/python2.7/dist-packages/pkg_resources.pyc +usr/lib/python2.7/dist-packages/pygments/__init__.py +usr/lib/python2.7/dist-packages/pygments/__init__.pyc +usr/lib/python2.7/dist-packages/pygments/cmdline.py +usr/lib/python2.7/dist-packages/pygments/cmdline.pyc +usr/lib/python2.7/dist-packages/pygments/console.py +usr/lib/python2.7/dist-packages/pygments/console.pyc +usr/lib/python2.7/dist-packages/pygments/filter.py +usr/lib/python2.7/dist-packages/pygments/filter.pyc +usr/lib/python2.7/dist-packages/pygments/filters/__init__.py +usr/lib/python2.7/dist-packages/pygments/filters/__init__.pyc +usr/lib/python2.7/dist-packages/pygments/formatter.py +usr/lib/python2.7/dist-packages/pygments/formatter.pyc +usr/lib/python2.7/dist-packages/pygments/formatters/__init__.py +usr/lib/python2.7/dist-packages/pygments/formatters/__init__.pyc +usr/lib/python2.7/dist-packages/pygments/formatters/_mapping.py +usr/lib/python2.7/dist-packages/pygments/formatters/_mapping.pyc +usr/lib/python2.7/dist-packages/pygments/formatters/html.py +usr/lib/python2.7/dist-packages/pygments/formatters/html.pyc +usr/lib/python2.7/dist-packages/pygments/formatters/latex.py +usr/lib/python2.7/dist-packages/pygments/formatters/latex.pyc +usr/lib/python2.7/dist-packages/pygments/formatters/terminal.py +usr/lib/python2.7/dist-packages/pygments/formatters/terminal.pyc +usr/lib/python2.7/dist-packages/pygments/lexer.py +usr/lib/python2.7/dist-packages/pygments/lexer.pyc +usr/lib/python2.7/dist-packages/pygments/lexers/__init__.py +usr/lib/python2.7/dist-packages/pygments/lexers/__init__.pyc +usr/lib/python2.7/dist-packages/pygments/lexers/_mapping.py +usr/lib/python2.7/dist-packages/pygments/lexers/_mapping.pyc +usr/lib/python2.7/dist-packages/pygments/lexers/css.py +usr/lib/python2.7/dist-packages/pygments/lexers/css.pyc +usr/lib/python2.7/dist-packages/pygments/lexers/html.py +usr/lib/python2.7/dist-packages/pygments/lexers/html.pyc +usr/lib/python2.7/dist-packages/pygments/lexers/javascript.py +usr/lib/python2.7/dist-packages/pygments/lexers/javascript.pyc +usr/lib/python2.7/dist-packages/pygments/lexers/jvm.py +usr/lib/python2.7/dist-packages/pygments/lexers/jvm.pyc +usr/lib/python2.7/dist-packages/pygments/lexers/ruby.py +usr/lib/python2.7/dist-packages/pygments/lexers/ruby.pyc +usr/lib/python2.7/dist-packages/pygments/lexers/special.py +usr/lib/python2.7/dist-packages/pygments/lexers/special.pyc +usr/lib/python2.7/dist-packages/pygments/modeline.py +usr/lib/python2.7/dist-packages/pygments/modeline.pyc +usr/lib/python2.7/dist-packages/pygments/plugin.py +usr/lib/python2.7/dist-packages/pygments/plugin.pyc +usr/lib/python2.7/dist-packages/pygments/regexopt.py +usr/lib/python2.7/dist-packages/pygments/regexopt.pyc +usr/lib/python2.7/dist-packages/pygments/style.py +usr/lib/python2.7/dist-packages/pygments/style.pyc +usr/lib/python2.7/dist-packages/pygments/styles/__init__.py +usr/lib/python2.7/dist-packages/pygments/styles/__init__.pyc +usr/lib/python2.7/dist-packages/pygments/styles/monokai.py +usr/lib/python2.7/dist-packages/pygments/styles/monokai.pyc +usr/lib/python2.7/dist-packages/pygments/token.py +usr/lib/python2.7/dist-packages/pygments/token.pyc +usr/lib/python2.7/dist-packages/pygments/unistring.py +usr/lib/python2.7/dist-packages/pygments/unistring.pyc +usr/lib/python2.7/dist-packages/pygments/util.py +usr/lib/python2.7/dist-packages/pygments/util.pyc +usr/lib/python2.7/dist-packages/python-support.pth +usr/lib/python2.7/dist-packages/roman-2.0.0.egg-info +usr/lib/python2.7/dist-packages/setuptools.pth +usr/lib/python2.7/email/__init__.py +usr/lib/python2.7/email/__init__.pyc +usr/lib/python2.7/email/_parseaddr.py +usr/lib/python2.7/email/_parseaddr.pyc +usr/lib/python2.7/email/base64mime.py +usr/lib/python2.7/email/base64mime.pyc +usr/lib/python2.7/email/charset.py +usr/lib/python2.7/email/charset.pyc +usr/lib/python2.7/email/encoders.py +usr/lib/python2.7/email/encoders.pyc +usr/lib/python2.7/email/errors.py +usr/lib/python2.7/email/errors.pyc +usr/lib/python2.7/email/feedparser.py +usr/lib/python2.7/email/feedparser.pyc +usr/lib/python2.7/email/iterators.py +usr/lib/python2.7/email/iterators.pyc +usr/lib/python2.7/email/message.py +usr/lib/python2.7/email/message.pyc +usr/lib/python2.7/email/mime/__init__.py +usr/lib/python2.7/email/mime/__init__.pyc +usr/lib/python2.7/email/parser.py +usr/lib/python2.7/email/parser.pyc +usr/lib/python2.7/email/quoprimime.py +usr/lib/python2.7/email/quoprimime.pyc +usr/lib/python2.7/email/utils.py +usr/lib/python2.7/email/utils.pyc +usr/lib/python2.7/encodings/__init__.py +usr/lib/python2.7/encodings/__init__.pyc +usr/lib/python2.7/encodings/aliases.py +usr/lib/python2.7/encodings/aliases.pyc +usr/lib/python2.7/encodings/ascii.py +usr/lib/python2.7/encodings/ascii.pyc +usr/lib/python2.7/encodings/utf_8.py +usr/lib/python2.7/encodings/utf_8.pyc +usr/lib/python2.7/fnmatch.py +usr/lib/python2.7/fnmatch.pyc +usr/lib/python2.7/functools.py +usr/lib/python2.7/functools.pyc +usr/lib/python2.7/genericpath.py +usr/lib/python2.7/genericpath.pyc +usr/lib/python2.7/getopt.py +usr/lib/python2.7/getopt.pyc +usr/lib/python2.7/hashlib.py +usr/lib/python2.7/hashlib.pyc +usr/lib/python2.7/heapq.py +usr/lib/python2.7/heapq.pyc +usr/lib/python2.7/io.py +usr/lib/python2.7/io.pyc +usr/lib/python2.7/keyword.py +usr/lib/python2.7/keyword.pyc +usr/lib/python2.7/lib-dynload +usr/lib/python2.7/lib-dynload/_hashlib.x86_64-linux-gnu.so +usr/lib/python2.7/lib-dynload/_ssl.x86_64-linux-gnu.so +usr/lib/python2.7/lib-dynload/parser.x86_64-linux-gnu.so +usr/lib/python2.7/lib-tk +usr/lib/python2.7/linecache.py +usr/lib/python2.7/linecache.pyc +usr/lib/python2.7/locale.py +usr/lib/python2.7/locale.pyc +usr/lib/python2.7/os.py +usr/lib/python2.7/os.pyc +usr/lib/python2.7/pkgutil.py +usr/lib/python2.7/pkgutil.pyc +usr/lib/python2.7/plat-x86_64-linux-gnu +usr/lib/python2.7/plat-x86_64-linux-gnu/_sysconfigdata_nd.py +usr/lib/python2.7/plat-x86_64-linux-gnu/_sysconfigdata_nd.pyc +usr/lib/python2.7/platform.py +usr/lib/python2.7/platform.pyc +usr/lib/python2.7/plistlib.py +usr/lib/python2.7/plistlib.pyc +usr/lib/python2.7/posixpath.py +usr/lib/python2.7/posixpath.pyc +usr/lib/python2.7/quopri.py +usr/lib/python2.7/quopri.pyc +usr/lib/python2.7/random.py +usr/lib/python2.7/random.pyc +usr/lib/python2.7/re.py +usr/lib/python2.7/re.pyc +usr/lib/python2.7/shutil.py +usr/lib/python2.7/shutil.pyc +usr/lib/python2.7/site.py +usr/lib/python2.7/site.pyc +usr/lib/python2.7/sitecustomize.py +usr/lib/python2.7/sitecustomize.pyc +usr/lib/python2.7/socket.py +usr/lib/python2.7/socket.pyc +usr/lib/python2.7/sre_compile.py +usr/lib/python2.7/sre_compile.pyc +usr/lib/python2.7/sre_constants.py +usr/lib/python2.7/sre_constants.pyc +usr/lib/python2.7/sre_parse.py +usr/lib/python2.7/sre_parse.pyc +usr/lib/python2.7/ssl.py +usr/lib/python2.7/ssl.pyc +usr/lib/python2.7/stat.py +usr/lib/python2.7/stat.pyc +usr/lib/python2.7/string.py +usr/lib/python2.7/string.pyc +usr/lib/python2.7/struct.py +usr/lib/python2.7/struct.pyc +usr/lib/python2.7/symbol.py +usr/lib/python2.7/symbol.pyc +usr/lib/python2.7/sysconfig.py +usr/lib/python2.7/sysconfig.pyc +usr/lib/python2.7/tempfile.py +usr/lib/python2.7/tempfile.pyc +usr/lib/python2.7/textwrap.py +usr/lib/python2.7/textwrap.pyc +usr/lib/python2.7/token.py +usr/lib/python2.7/token.pyc +usr/lib/python2.7/traceback.py +usr/lib/python2.7/traceback.pyc +usr/lib/python2.7/types.py +usr/lib/python2.7/types.pyc +usr/lib/python2.7/urllib.py +usr/lib/python2.7/urllib.pyc +usr/lib/python2.7/urlparse.py +usr/lib/python2.7/urlparse.pyc +usr/lib/python2.7/uu.py +usr/lib/python2.7/uu.pyc +usr/lib/python2.7/warnings.py +usr/lib/python2.7/warnings.pyc +usr/lib/python2.7/weakref.py +usr/lib/python2.7/weakref.pyc +usr/lib/python2.7/zipfile.py +usr/lib/python2.7/zipfile.pyc +usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0 +usr/lib/x86_64-linux-gnu/libssl.so.1.0.0 usr/lib/x86_64-linux-gnu/libstdc++.so.6 usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.20 +usr/local/bin/caddy usr/local/bin/getPublicId +usr/local/lib/python2.7/dist-packages usr/share/git-core/templates usr/share/git-core/templates/branches usr/share/git-core/templates/description @@ -853,3 +1170,4 @@ usr/share/git-core/templates/hooks/prepare-commit-msg.sample usr/share/git-core/templates/hooks/update.sample usr/share/git-core/templates/info usr/share/git-core/templates/info/exclude +usr/share/pyshared/ndg_httpsclient-0.3.2.egg-info/namespace_packages.txt diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 341d9bd..9088df9 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = ( appVersion = 0, # Increment this for every release. - appMarketingVersion = (defaultText = "0.17"), + appMarketingVersion = (defaultText = "0.18.1-sandstorm0"), # Human-readable representation of appVersion. Should match the way you # identify versions of your app in documentation and marketing. @@ -109,7 +109,7 @@ const pkgdef :Spk.PackageDefinition = ( # # Where `` is a PGP key ID or email address associated with the key. - #description = (defaultText = embed "../description.md"), + description = (defaultText = embed "../description.md"), # The app's description in Github-flavored Markdown format, to be displayed e.g. # in an app store. Note that the Markdown is not permitted to contain HTML nor image tags (but # you can include a list of screenshots separately). @@ -144,7 +144,7 @@ const pkgdef :Spk.PackageDefinition = ( ( sourcePath = "/", # Then search the system root directory. hidePaths = [ "home", "proc", "sys", "etc/hosts", "etc/host.conf", - "etc/nsswitch.conf", "etc/resolv.conf" ] + "etc/passwd", "etc/nsswitch.conf", "etc/resolv.conf" ] # You probably don't want the app pulling files from these places, # so we hide them. Note that /dev, /var, and /tmp are implicitly # hidden because Sandstorm itself provides them. @@ -156,7 +156,9 @@ const pkgdef :Spk.PackageDefinition = ( # `spk dev` will write a list of all the files your app uses to this file. # You should review it later, before shipping your app. - alwaysInclude = [], + alwaysInclude = [ + "usr/lib/python2.7/dist-packages/pygments" + ], # Fill this list with more names of files or directories that should be # included in your package, even if not listed in sandstorm-files.list. # Use this to force-include stuff that you know you need but which may diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index 416d0e5..5151836 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -56,7 +56,15 @@ cp /opt/app/sandstorm-integration/bin/getPublicId /usr/local/bin curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - apt-get install -y nodejs +apt-get install -y python-pip +pip install pygments + cd /tmp -wget https://github.com/spf13/hugo/releases/download/v0.17/hugo_0.17-64bit.deb -O hugo.deb +wget https://github.com/spf13/hugo/releases/download/v0.18.1/hugo_0.18.1-64bit.deb -O hugo.deb dpkg -i hugo.deb rm hugo.deb +wget "https://caddyserver.com/download/build?os=linux&arch=amd64&features=filemanager%2Chugo" -O /tmp/caddy.tar.gz +cd /tmp +tar xfz caddy.tar.gz +mv caddy /usr/local/bin +rm caddy.tar.gz diff --git a/Caddyfile b/Caddyfile new file mode 100644 index 0000000..be7554d --- /dev/null +++ b/Caddyfile @@ -0,0 +1,6 @@ +127.0.0.1:8001 +errors stderr +log stdout +hugo /var/git { + allow_commands false +} diff --git a/package.json b/package.json index c7c1ebf..656acb4 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "dependencies": { "express": "~4.13.4", "git-http-backend": "^1.0.1", + "http-proxy": "^1.15.1", "jade": "~1.11.0", "morgan": "~1.7.0" } diff --git a/routes.js b/routes.js index 5d38fba..24466c2 100644 --- a/routes.js +++ b/routes.js @@ -1,5 +1,6 @@ var exec = require("child_process").exec, express = require('express'), + httpProxy = require("http-proxy"), router = express.Router(), gitBackend = require("git-http-backend"), spawn = require("child_process").spawn @@ -32,4 +33,11 @@ router.use("/git", (req, res) => { })).pipe(res) }) +var proxy = httpProxy.createProxyServer({ + target: "http://127.0.0.1:8001/admin/", + changeOrigin: true +}) + +router.use("/admin/", (req, res) => proxy.web(req, res)) + module.exports = router diff --git a/views/index.jade b/views/index.jade index 7410db6..ea34b67 100644 --- a/views/index.jade +++ b/views/index.jade @@ -7,6 +7,7 @@ block content iframe#gitAuthorize(style = "width: 100%; height: 55px; margin: 0; border: 0;") p Then run the following: iframe#gitClone(style = "width: 100%; height: 55px; margin: 0; border: 0;") + a(href = "/admin/") Administer script. document.addEventListener("DOMContentLoaded", function() { window.parent.postMessage({renderTemplate: {