Get Hugo 0.69.0 working, other updates #1
@ -244,7 +244,6 @@ const myCommand :Spk.Manifest.Command = (
|
|||||||
(key = "SANDSTORM", value = "1"),
|
(key = "SANDSTORM", value = "1"),
|
||||||
(key = "HOME", value = "/var"),
|
(key = "HOME", value = "/var"),
|
||||||
(key = "NODE_ENV", value = "production"),
|
(key = "NODE_ENV", value = "production"),
|
||||||
(key = "NODE_DEBUG", value = "fs"),
|
|
||||||
# Export SANDSTORM=1 into the environment, so that apps running within Sandstorm
|
# 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
|
# can detect if $SANDSTORM="1" at runtime, switching UI and/or backend to use
|
||||||
# the app's Sandstorm-specific integration code.
|
# the app's Sandstorm-specific integration code.
|
||||||
|
@ -12,8 +12,8 @@ apt-get update
|
|||||||
apt-get install -y git strace
|
apt-get install -y git strace
|
||||||
|
|
||||||
# First, get capnproto from master and install it to
|
# First, get capnproto from master and install it to
|
||||||
# /usr/local/bin. This requires a C++ compiler. We opt for gcc-6
|
# /usr/local/bin. This requires a C++ compiler. We opt for clang
|
||||||
# because that's what capnproto now requires.
|
# because that's what Sandstorm is typically compiled with.
|
||||||
if [ ! -e /usr/local/bin/capnp ] ; then
|
if [ ! -e /usr/local/bin/capnp ] ; then
|
||||||
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q clang autoconf pkg-config libtool
|
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q clang autoconf pkg-config libtool
|
||||||
cd /tmp
|
cd /tmp
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Hugo Sandstorm package
|
# Hugo Sandstorm package
|
||||||
|
|
||||||
This is the [Sandstorm](https://sandstorm.io) package of [Hugo](https://gohugo.io/).
|
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
|
## Development
|
||||||
|
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
import Nuxt from "nuxt"
|
import Nuxt from "nuxt"
|
||||||
import logger from "morgan"
|
import logger from "morgan"
|
||||||
import fs from 'fs'
|
import fs from 'fs'
|
||||||
const exec = require("child_process").exec
|
|
||||||
const execFile = require("child_process").execFile
|
|
||||||
import Express from "express"
|
import Express from "express"
|
||||||
import gitBackend from "git-http-backend"
|
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"
|
//import httpProxy from "http-proxy"
|
||||||
const spawn = require("child_process").spawn
|
const spawn = require("child_process").spawn
|
||||||
|
|
||||||
@ -20,6 +20,9 @@ app.set("port", port)
|
|||||||
app.get("/publicId", (req, res) => {
|
app.get("/publicId", (req, res) => {
|
||||||
const sessionId = req.headers["x-sandstorm-session-id"]
|
const sessionId = req.headers["x-sandstorm-session-id"]
|
||||||
let allData = ""
|
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 file = `/var/publicid-${sessionId}`
|
||||||
|
|
||||||
const handleResult = () => {
|
const handleResult = () => {
|
||||||
@ -94,7 +97,6 @@ app.use(nuxt.render)
|
|||||||
if (config.dev) {
|
if (config.dev) {
|
||||||
nuxt.build()
|
nuxt.build()
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.log('whoa')
|
|
||||||
console.error(error) // eslint-disable-line no-console
|
console.error(error) // eslint-disable-line no-console
|
||||||
process.exit(1)
|
process.exit(1)
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user