-
Your public site is available at {{ url }}.
-
-
To set up your domain to point at your public site, add the following DNS records to your domain. Replace blog.example.com with your site's hostname.
-
-
- | Name |
- Type |
- Value |
-
-
-
- | blog.example.com |
- CNAME |
- {{ domain }} |
-
-
- | sandstorm-www.blog.example.com |
- TXT |
- {{ publicId }} |
-
-
-
-
+
+
+ Loading public site information...
+
+
+
+
+ Unable to load public site information! Try restarting the grain.
+ This is a known bug.
+
+
+
+ Your public site is available at {{ url }}.
+
+
To set up your domain to point at your public site, add the following DNS records to your domain. Replace blog.example.com with your site's hostname.
+
+
+ | Name |
+ Type |
+ Value |
+
+
+
+ | blog.example.com |
+ CNAME |
+ {{ domain }} |
+
+
+ | sandstorm-www.blog.example.com |
+ TXT |
+ {{ publicId }} |
+
+
+
+
Editing Your Site
To check out the Git repository containing your site, first add an authorization key to Git:
{
@@ -72,17 +87,25 @@
return ""
}
},
- mounted() {
- fetch("/publicId", {
- credentials: "same-origin"
- }).then((r) => r.json())
- .then((r) => {
- this.isDemo = r.isDemo
- this.url = r.url
- this.publicId = r.publicId
- this.domain = r.domain
- })
- .catch(console.error)
+ // mounted actions occur immediately. we use async here to
+ // simplify promise handling.
+ async mounted () {
+ this.isLoading = true
+ try {
+ const result = await fetch("/publicId", {
+ credentials: "same-origin"
+ })
+ const jsonResult = await result.json()
+ this.isDemo = jsonResult.isDemo
+ this.url = jsonResult.url
+ this.publicId = jsonResult.publicId
+ this.domain = jsonResult.domain
+ } catch (e) {
+ console.error(e)
+ this.loadError = e
+ } finally {
+ this.isLoading = false
+ }
},
head: {
title: "Home"
diff --git a/sandstorm-integration/getPublicId.zc++ b/sandstorm-integration/getPublicId.zc++
deleted file mode 100644
index 635cfe6..0000000
--- a/sandstorm-integration/getPublicId.zc++
+++ /dev/null
@@ -1,75 +0,0 @@
-// Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
-//
-
-// Hack around stdlib bug with C++14.
-#include // force libstdc++ to include its config
-#undef _GLIBCXX_HAVE_GETS // correct broken config
-// End hack.
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-namespace sandstorm {
-
- class GetPublicIdMain {
- public:
- GetPublicIdMain(kj::ProcessContext& context): context(context) { }
-
- kj::MainFunc getMain() {
- return kj::MainBuilder(context, "GetPublicId version: 0.0.2",
- "Runs the getPublicId command from hack-session.capnp. "
- "Outputs the return arguments as separate lines on stdout.")
- .expectArg("", KJ_BIND_METHOD(*this, setSessionId))
- .callAfterParsing(KJ_BIND_METHOD(*this, run))
- .build();
- }
-
- kj::MainBuilder::Validity setSessionId(kj::StringPtr id) {
- sessionId = kj::heapString(id);
- return true;
- }
-
- kj::MainBuilder::Validity run() {
- capnp::EzRpcClient client("unix:/tmp/sandstorm-api");
- SandstormHttpBridge::Client restorer = client.getMain();
-
- auto request = restorer.getSessionContextRequest();
- request.setId(sessionId);
- auto session = request.send().getContext().castAs();
-
- kj::Promise promise = session.getPublicIdRequest().send().then([](auto result) {
- auto publicId = result.getPublicId();
- auto hostname = result.getHostname();
- auto autoUrl = result.getAutoUrl();
- auto isDemoUser = result.getIsDemoUser();
- kj::String msg = kj::str(publicId, "\n", hostname, "\n", autoUrl, "\n",
- isDemoUser ? "true" : "false", "\n");
- kj::FdOutputStream(STDOUT_FILENO).write(msg.begin(), msg.size());
- }, [] (auto e) {
- auto desc = e.getDescription();
- kj::FdOutputStream(STDOUT_FILENO).write(desc.begin(), desc.size());
- });
-
- promise.wait(client.getWaitScope());
- return true;
- }
-
- private:
- kj::ProcessContext& context;
- kj::String sessionId;
- };
-
-} // namespace sandstorm
-
-KJ_MAIN(sandstorm::GetPublicIdMain)
diff --git a/sandstorm-integration/getPublicId.zzzc++ b/sandstorm-integration/getPublicId.zzzc++
deleted file mode 100644
index b88824d..0000000
--- a/sandstorm-integration/getPublicId.zzzc++
+++ /dev/null
@@ -1,83 +0,0 @@
-// Sandstorm - Personal Cloud Sandbox
-// Copyright (c) 2014 Sandstorm Development Group, Inc. and contributors
-//
-
-// Hack around stdlib bug with C++14.
-#include // force libstdc++ to include its config
-#undef _GLIBCXX_HAVE_GETS // correct broken config
-// End hack.
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-namespace sandstorm {
-
- class GetPublicIdMain {
- public:
- GetPublicIdMain(kj::ProcessContext& context): context(context) { }
-
- kj::MainFunc getMain() {
- return kj::MainBuilder(context, "GetPublicId version: 0.0.2",
- "Runs the getPublicId command from hack-session.capnp. "
- "Returns the ID and the host name as two lines on stdout.")
- .expectArg("", KJ_BIND_METHOD(*this, setSessionId))
- .callAfterParsing(KJ_BIND_METHOD(*this, run))
- .build();
- }
-
- kj::MainBuilder::Validity setSessionId(kj::StringPtr id) {
- sessionId = kj::heapString(id);
- return true;
- }
-
- kj::MainBuilder::Validity run() {
- capnp::EzRpcClient client("unix:/tmp/sandstorm-api");
- SandstormHttpBridge::Client restorer = client.getMain();
-
- auto request = restorer.getSessionContextRequest();
- request.setId(sessionId);
- auto session = request.send().getContext().castAs();
-
- kj::Promise promise = session.getPublicIdRequest().send().then(
- [](HackSessionContext::GetPublicIdResults::Reader result) {
- auto publicId = result.getPublicId();
- auto hostname = result.getHostname();
- auto autoUrl = result.getAutoUrl();
- kj::String msg =
- kj::str(
- "Your content has automatically been published at\n",
- " ", autoUrl, "\n",
- "You can show this content on a custom domain by adding the following\n"
- "DNS records:\n"
- " IN CNAME ", hostname, "\n"
- " sandstorm-www. IN TXT ", publicId, "\n");
- kj::FdOutputStream(STDOUT_FILENO).write(msg.begin(), msg.size());
- }, [] (kj::Exception&& e) {
- auto desc = e.getDescription();
- kj::FdOutputStream(STDOUT_FILENO).write(desc.begin(), desc.size());
- });
-
- promise.wait(client.getWaitScope());
- return true;
- }
-
- private:
- kj::ProcessContext& context;
- kj::String sessionId;
- };
-
-} // namespace sandstorm
-
-KJ_MAIN(sandstorm::GetPublicIdMain)
-
-
From 24615e069f9b26256235bc4ad1a8b31cbd22dfb1 Mon Sep 17 00:00:00 2001
From: John Bintz <27256+johnbintz@users.noreply.github.com>
Date: Fri, 10 Apr 2020 09:13:08 -0400
Subject: [PATCH 4/6] PR tweaks
---
.sandstorm/sandstorm-pkgdef.capnp | 1 -
.sandstorm/setup.sh | 4 ++--
README.md | 2 +-
server.js | 8 +++++---
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index cdf9b4d..0362443 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -244,7 +244,6 @@ const myCommand :Spk.Manifest.Command = (
(key = "SANDSTORM", value = "1"),
(key = "HOME", value = "/var"),
(key = "NODE_ENV", value = "production"),
- (key = "NODE_DEBUG", value = "fs"),
# Export SANDSTORM=1 into the environment, so that apps running within Sandstorm
# can detect if $SANDSTORM="1" at runtime, switching UI and/or backend to use
# the app's Sandstorm-specific integration code.
diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh
index d2349c6..9bda403 100755
--- a/.sandstorm/setup.sh
+++ b/.sandstorm/setup.sh
@@ -12,8 +12,8 @@ apt-get update
apt-get install -y git strace
# First, get capnproto from master and install it to
-# /usr/local/bin. This requires a C++ compiler. We opt for gcc-6
-# because that's what capnproto now requires.
+# /usr/local/bin. This requires a C++ compiler. We opt for clang
+# because that's what Sandstorm is typically compiled with.
if [ ! -e /usr/local/bin/capnp ] ; then
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q clang autoconf pkg-config libtool
cd /tmp
diff --git a/README.md b/README.md
index c830eb1..a6c8800 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Hugo Sandstorm package
This is the [Sandstorm](https://sandstorm.io) package of [Hugo](https://gohugo.io/).
-The version of Hugo in this build is 0.68.3.
+The version of Hugo in this build is 0.69.0.
## Development
diff --git a/server.js b/server.js
index 5605ff3..f649b81 100644
--- a/server.js
+++ b/server.js
@@ -1,10 +1,10 @@
import Nuxt from "nuxt"
import logger from "morgan"
import fs from 'fs'
-const exec = require("child_process").exec
-const execFile = require("child_process").execFile
import Express from "express"
import gitBackend from "git-http-backend"
+// TODO: once Caddy 2 or something similar is in place, reinstate the
+// admin proxy.
//import httpProxy from "http-proxy"
const spawn = require("child_process").spawn
@@ -20,6 +20,9 @@ app.set("port", port)
app.get("/publicId", (req, res) => {
const sessionId = req.headers["x-sandstorm-session-id"]
let allData = ""
+ // TODO: figure out why Cap'n Proto keeps crashing when
+ // getPublicId exits so we can get rid of this weird
+ // memoization hack I had to do!
const file = `/var/publicid-${sessionId}`
const handleResult = () => {
@@ -94,7 +97,6 @@ app.use(nuxt.render)
if (config.dev) {
nuxt.build()
.catch((error) => {
- console.log('whoa')
console.error(error) // eslint-disable-line no-console
process.exit(1)
})
From 129a8befa2db096f8c30cb8dcb13e8c18a9a1078 Mon Sep 17 00:00:00 2001
From: John Bintz <27256+johnbintz@users.noreply.github.com>
Date: Fri, 10 Apr 2020 09:43:03 -0400
Subject: [PATCH 5/6] more updates
---
.sandstorm/sandstorm-files.list | 6 +++---
CHANGELOG.md | 2 +-
pages/index.vue | 8 +++++++-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list
index 7aebcd1..d6bca01 100644
--- a/.sandstorm/sandstorm-files.list
+++ b/.sandstorm/sandstorm-files.list
@@ -88,13 +88,13 @@ opt/app/.git/objects/pack
opt/app/.git/refs
opt/app/.git/refs/heads/master
opt/app/.git/refs/heads/updates
-opt/app/.nuxt/dist/0.nuxt.bundle.cabb8e44fef2f7294b40.js
+opt/app/.nuxt/dist/0.nuxt.bundle.4b9cc2e32c0f467ee864.js
opt/app/.nuxt/dist/1.nuxt.bundle.bbbffbc78054dc5f0891.js
opt/app/.nuxt/dist/index.html
-opt/app/.nuxt/dist/manifest.a99b97d9c9bc251323e7.js
+opt/app/.nuxt/dist/manifest.3d73755da5587b09860e.js
opt/app/.nuxt/dist/nuxt.bundle.dbf51a8ed53569a6c1b0.js
opt/app/.nuxt/dist/server-bundle.json
-opt/app/.nuxt/dist/vendor.bundle.a99b97d9c9bc251323e7.js
+opt/app/.nuxt/dist/vendor.bundle.3d73755da5587b09860e.js
opt/app/.sandstorm/launcher.sh
opt/app/README.md
opt/app/node_modules/.bin/babel-node
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a03e654..51315cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
## 0.69.0 (2020-04-10)
-The "I can't stand Hugo 0.20.somethng anymore" release.
+The "I can't stand Hugo 0.20.something anymore" release.
### Enhancements
diff --git a/pages/index.vue b/pages/index.vue
index 3fb5ceb..d787522 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -12,7 +12,7 @@
- Your public site is available at {{ url }}.
+ Your public site is available at {{ url }}.
To set up your domain to point at your public site, add the following DNS records to your domain. Replace blog.example.com with your site's hostname.
@@ -57,6 +57,12 @@
+ Admin Interface
+
+ ...had to be removed temporarily because Caddy 1 isn't recommended anymore and
+ Caddy 2 needs some work to get working well with Hugo.
+ Want to help?
+
From f4c4310d00079ad7a6132503a77b6a91b2579850 Mon Sep 17 00:00:00 2001
From: John Bintz <27256+johnbintz@users.noreply.github.com>
Date: Fri, 10 Apr 2020 10:08:44 -0400
Subject: [PATCH 6/6] final tweaks
---
.sandstorm/sandstorm-files.list | 1 -
.sandstorm/setup.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list
index d6bca01..7553291 100644
--- a/.sandstorm/sandstorm-files.list
+++ b/.sandstorm/sandstorm-files.list
@@ -2762,7 +2762,6 @@ usr/bin/npm
usr/bin/python
usr/bin/python2.7
usr/bin/ruby
-usr/bin/strace
usr/bin/sudo
usr/bin/touch
usr/bin/yes
diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh
index 9bda403..a1c5a90 100755
--- a/.sandstorm/setup.sh
+++ b/.sandstorm/setup.sh
@@ -9,7 +9,7 @@ export HUGO_VERSION=0.69.0
export NODE_VERSION=10
apt-get update
-apt-get install -y git strace
+apt-get install -y git
# First, get capnproto from master and install it to
# /usr/local/bin. This requires a C++ compiler. We opt for clang