Compare commits

..

No commits in common. "master" and "0.69.0-review-fixes" have entirely different histories.

22 changed files with 174 additions and 403 deletions

2
.nvmrc
View File

@ -1 +1 @@
14
10

View File

@ -1 +0,0 @@
3.1

View File

@ -1,8 +1,6 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
# CAUTION: DO NOT MAKE CHANGES TO THIS FILE. The vagrant-spk upgradevm process will overwrite it.
# Guess at a reasonable name for the VM based on the folder vagrant-spk is
# run from. The timestamp is there to avoid conflicts if you have multiple
# folders with the same name.
@ -11,18 +9,14 @@ VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Ti
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
# ugly hack to prevent hashicorp's bitrot. See https://github.com/hashicorp/vagrant/issues/9442
# this setting is required for pre-2.0 vagrant, but causes an error as of 2.0.3,
# remove entirely when confident nobody uses vagrant 1.x for anything.
unless Vagrant::DEFAULT_SERVER_URL.frozen?
Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com')
end
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Base on the Sandstorm snapshots of the official Debian 9 (stretch) box with vboxsf support.
config.vm.box = "debian/contrib-buster64"
config.vm.post_up_message = "Your virtual server is running at http://local.sandstorm.io:6090."
# Base on the Sandstorm snapshots of the official Debian 8 (jessie) box.
config.vm.box = "debian/contrib-stretch64"
config.vm.box_version = ">= 0"
if Vagrant.has_plugin?("vagrant-vbguest") then
# vagrant-vbguest is a Vagrant plugin that upgrades
@ -33,10 +27,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.guest = "debian"
end
# We forward port 6090, the vagrant-spk web port, so that developers can
# visit their Sandstorm app from their browser as local.sandstorm.io:6090
# (aka 127.0.0.1:6090).
config.vm.network :forwarded_port, guest: 6090, host: 6090, host_ip: "127.0.0.1"
# We forward port 6080, the Sandstorm web port, so that developers can
# visit their sandstorm app from their browser as local.sandstorm.io:6080
# (aka 127.0.0.1:6080).
config.vm.network :forwarded_port, guest: 6080, host: 6080
# Use a shell script to "provision" the box. This installs Sandstorm using
# the bundled installer.
@ -61,8 +55,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
cpus = `nproc`.to_i
total_kB_ram = `grep MemTotal /proc/meminfo | awk '{print $2}'`.to_i
elsif host =~ /mingw/
# powershell may not be available on Windows XP and Vista, so wrap this in a rescue block
begin
cpus = `powershell -Command "(Get-WmiObject Win32_Processor -Property NumberOfLogicalProcessors | Select-Object -Property NumberOfLogicalProcessors | Measure-Object NumberOfLogicalProcessors -Sum).Sum"`.to_i
total_kB_ram = `powershell -Command "[math]::Round((Get-WmiObject -Class Win32_ComputerSystem).TotalPhysicalMemory)"`.to_i / 1024
total_kB_ram = `powershell -Command "Get-CimInstance -class cim_physicalmemory | % $_.Capacity}"`.to_i / 1024
rescue
end
end
# Use the same number of CPUs within Vagrant as the system, with 1
# as a default.

View File

@ -1 +0,0 @@
0.104.2~2022-10-04

View File

@ -1,51 +1,3 @@
## 0.104.2~2022-10-04
* Upgrade Hugo to 0.104.2 extended
## 0.100.2~2022-06-12
* Upgrade Hugo to 0.100.2 extended
## 0.99.1~2022-05-25
* Upgrade Hugo to 0.99.1 extended
## 0.95.0~2022-03-16
* Upgrade Hugo to 0.95.0 extended
## 0.93.0~2022-02-28
* Upgrade Hugo to 0.93.0 extended
## 0.91.2~2022-01-01
* Upgrade Hugo to 0.91.2 extended
## 0.90.1~2021-12-10
* Upgrade Hugo to 0.90.1 extended
## 0.90.0~2021-12-08
* Upgrade Hugo to 0.90.0 extended
## 0.89.4~2021-11-19
* Upgrade Hugo to 0.89.4 extended
## 0.88.1~2021-10-10
* Upgrade Hugo to 0.88.1 extended
## 0.79.1~2020-12-22
* Upgrade Hugo to 0.79.1 to deal with security issue
# V0.74.3-2020-07-28
* Upgrade Hugo to 0.74.3
# V0.69.0~2020-04-21
* Upgrade Hugo to 0.69.0.

View File

@ -1,9 +1,6 @@
#!/bin/bash
set -euo pipefail
# CAUTION: DO NOT MAKE CHANGES TO THIS FILE. The vagrant-spk upgradevm process will overwrite it.
# App-specific setup should be done in the setup.sh file.
# Set options for curl. Since we only want to show errors from these curl commands, we also use
# 'cat' to buffer the output; for more information:
# https://github.com/sandstorm-io/vagrant-spk/issues/158
@ -11,15 +8,9 @@ set -euo pipefail
CURL_OPTS="--silent --show-error"
echo localhost > /etc/hostname
hostname localhost
# Grub updates don't silent install well
apt-mark hold grub-pc
apt-get update
apt-get upgrade -y
# Install curl that is needed below.
apt-get -y update
apt-get install -y curl
# The following line copies stderr through stderr to cat without accidentally leaving it in the
# output file. Be careful when changing. See: https://github.com/sandstorm-io/vagrant-spk/pull/159
curl $CURL_OPTS https://install.sandstorm.io/ 2>&1 > /host-dot-sandstorm/caches/install.sh | cat
@ -34,7 +25,7 @@ if [[ ! -f /host-dot-sandstorm/caches/$SANDSTORM_PACKAGE ]] ; then
fi
if [ ! -e /opt/sandstorm/latest/sandstorm ] ; then
echo -n "Installing Sandstorm version ${SANDSTORM_CURRENT_VERSION}..."
bash /host-dot-sandstorm/caches/install.sh -d -e -p 6090 "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE" >/dev/null
bash /host-dot-sandstorm/caches/install.sh -d -e "/host-dot-sandstorm/caches/$SANDSTORM_PACKAGE" >/dev/null
echo "...done."
fi
modprobe ip_tables
@ -45,10 +36,6 @@ usermod -a -G 'sandstorm' 'vagrant'
sudo sed --in-place='' \
--expression='s/^BIND_IP=.*/BIND_IP=0.0.0.0/' \
/opt/sandstorm/sandstorm.conf
# Force vagrant-spk to use the strict CSP, see sandstorm#3424 for details.
echo 'ALLOW_LEGACY_RELAXED_CSP=false' >> /opt/sandstorm/sandstorm.conf
sudo service sandstorm restart
# Enable apt-cacher-ng proxy to make things faster if one appears to be running on the gateway IP
GATEWAY_IP=$(ip route | grep ^default | cut -d ' ' -f 3)

View File

@ -3,30 +3,102 @@
# the app runs in dev mode. You may manually add or remove files, but don't
# expect comments or ordering to be retained.
bin
bin/bash
bin/cp
bin/dash
bin/less
bin/ln
bin/ls
bin/mkdir
bin/rm
bin/sh
bin/sleep
bin/touch
bin/which
etc/alternatives/pager
etc/bash.bashrc
etc/group
etc/inputrc
etc/ld.so.cache
etc/localtime
etc/mailname
etc/mime.types
etc/python2.7/sitecustomize.py
etc/ssl/openssl.cnf
lib
lib64
lib/terminfo/d/dumb
lib/x86_64-linux-gnu/ld-2.24.so
lib/x86_64-linux-gnu/libacl.so.1
lib/x86_64-linux-gnu/libacl.so.1.1.0
lib/x86_64-linux-gnu/libattr.so.1
lib/x86_64-linux-gnu/libattr.so.1.1.0
lib/x86_64-linux-gnu/libaudit.so.1
lib/x86_64-linux-gnu/libaudit.so.1.0.0
lib/x86_64-linux-gnu/libbsd.so.0
lib/x86_64-linux-gnu/libbsd.so.0.8.3
lib/x86_64-linux-gnu/libbz2.so.1.0
lib/x86_64-linux-gnu/libbz2.so.1.0.4
lib/x86_64-linux-gnu/libc-2.24.so
lib/x86_64-linux-gnu/libc.so.6
lib/x86_64-linux-gnu/libcap-ng.so.0
lib/x86_64-linux-gnu/libcap-ng.so.0.0.0
lib/x86_64-linux-gnu/libcrypt.so.1
lib/x86_64-linux-gnu/libdl-2.24.so
lib/x86_64-linux-gnu/libdl.so.2
lib/x86_64-linux-gnu/libexpat.so.1
lib/x86_64-linux-gnu/libexpat.so.1.6.2
lib/x86_64-linux-gnu/libgcc_s.so.1
lib/x86_64-linux-gnu/libglib-2.0.so.0
lib/x86_64-linux-gnu/libglib-2.0.so.0.5000.3
lib/x86_64-linux-gnu/liblzma.so.5
lib/x86_64-linux-gnu/liblzma.so.5.2.2
lib/x86_64-linux-gnu/libm-2.24.so
lib/x86_64-linux-gnu/libm.so.6
lib/x86_64-linux-gnu/libncurses.so.5
lib/x86_64-linux-gnu/libncurses.so.5.9
lib/x86_64-linux-gnu/libnsl-2.24.so
lib/x86_64-linux-gnu/libnsl.so.1
lib/x86_64-linux-gnu/libnss_compat-2.24.so
lib/x86_64-linux-gnu/libnss_compat.so.2
lib/x86_64-linux-gnu/libnss_dns-2.24.so
lib/x86_64-linux-gnu/libnss_dns.so.2
lib/x86_64-linux-gnu/libnss_files-2.24.so
lib/x86_64-linux-gnu/libnss_files.so.2
lib/x86_64-linux-gnu/libnss_nis-2.24.so
lib/x86_64-linux-gnu/libnss_nis.so.2
lib/x86_64-linux-gnu/libpcre.so.3
lib/x86_64-linux-gnu/libpcre.so.3.13.3
lib/x86_64-linux-gnu/libpopt.so.0
lib/x86_64-linux-gnu/libpopt.so.0.0.0
lib/x86_64-linux-gnu/libpthread-2.24.so
lib/x86_64-linux-gnu/libpthread.so.0
lib/x86_64-linux-gnu/libreadline.so.7
lib/x86_64-linux-gnu/libreadline.so.7.0
lib/x86_64-linux-gnu/libresolv-2.24.so
lib/x86_64-linux-gnu/libresolv.so.2
lib/x86_64-linux-gnu/librt-2.24.so
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.24.so
lib/x86_64-linux-gnu/libutil.so.1
lib/x86_64-linux-gnu/libuuid.so.1
lib/x86_64-linux-gnu/libuuid.so.1.3.0
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/.babelrc
opt/app/.cloudcmd.menu.js
opt/app/.nuxt/dist/0.nuxt.bundle.bc3db06116b867754b0c.js
opt/app/.nuxt/dist/0.nuxt.bundle.ef50340c3600ea7e30a7.js
opt/app/.nuxt/dist/1.nuxt.bundle.89a9958091c34dcc68ed.js
opt/app/.nuxt/dist/index.html
opt/app/.nuxt/dist/manifest.34bbd08272989f0e194c.js
opt/app/.nuxt/dist/nuxt.bundle.605f5435b643949bed50.js
opt/app/.nuxt/dist/manifest.7c112ec70f8b3c557a15.js
opt/app/.nuxt/dist/nuxt.bundle.dbf51a8ed53569a6c1b0.js
opt/app/.nuxt/dist/server-bundle.json
opt/app/.nuxt/dist/vendor.bundle.34bbd08272989f0e194c.js
opt/app/.nuxt/dist/vendor.bundle.7c112ec70f8b3c557a15.js
opt/app/.sandstorm/launcher.sh
opt/app/README.md
opt/app/hugo-version
opt/app/node_modules/.bin/babel-node
opt/app/node_modules/@babel/code-frame/lib/index.js
opt/app/node_modules/@babel/code-frame/package.json
@ -548,7 +620,6 @@ opt/app/node_modules/babel-core/lib/transformation/plugin-pass.js
opt/app/node_modules/babel-core/lib/transformation/plugin.js
opt/app/node_modules/babel-core/lib/util.js
opt/app/node_modules/babel-core/node_modules/debug/node.js
opt/app/node_modules/babel-core/node_modules/debug/package.json
opt/app/node_modules/babel-core/node_modules/debug/src/debug.js
opt/app/node_modules/babel-core/node_modules/debug/src/node.js
opt/app/node_modules/babel-core/package.json
@ -978,7 +1049,6 @@ opt/app/node_modules/caniuse-db/features-json/text-size-adjust.json
opt/app/node_modules/caniuse-db/features-json/transforms2d.json
opt/app/node_modules/caniuse-db/features-json/transforms3d.json
opt/app/node_modules/caniuse-db/features-json/user-select-none.json
opt/app/node_modules/caniuse-db/package.json
opt/app/node_modules/chalk/index.js
opt/app/node_modules/chalk/package.json
opt/app/node_modules/chalk/templates.js
@ -1751,7 +1821,6 @@ opt/app/node_modules/daffy/lib/daffy.js
opt/app/node_modules/daffy/package.json
opt/app/node_modules/date-fns/_lib/requiredArgs/index.js
opt/app/node_modules/date-fns/_lib/toInteger/index.js
opt/app/node_modules/date-fns/package.json
opt/app/node_modules/date-fns/parseISO/index.js
opt/app/node_modules/date-fns/parseISO/package.json
opt/app/node_modules/debug/node_modules/ms/index.js
@ -1897,14 +1966,10 @@ opt/app/node_modules/edward/modules/ace-builds/src-min/ace.js
opt/app/node_modules/edward/modules/ace-builds/src-min/ext-language_tools.js
opt/app/node_modules/edward/modules/ace-builds/src-min/ext-modelist.js
opt/app/node_modules/edward/modules/ace-builds/src-min/ext-searchbox.js
opt/app/node_modules/edward/modules/ace-builds/src-min/mode-html.js
opt/app/node_modules/edward/modules/ace-builds/src-min/mode-javascript.js
opt/app/node_modules/edward/modules/ace-builds/src-min/mode-json.js
opt/app/node_modules/edward/modules/ace-builds/src-min/mode-markdown.js
opt/app/node_modules/edward/modules/ace-builds/src-min/mode-toml.js
opt/app/node_modules/edward/modules/ace-builds/src-min/theme-tomorrow_night_blue.js
opt/app/node_modules/edward/modules/ace-builds/src-min/worker-html.js
opt/app/node_modules/edward/modules/ace-builds/src-min/worker-json.js
opt/app/node_modules/edward/package.json
opt/app/node_modules/edward/server/edit.js
opt/app/node_modules/edward/server/index.js
@ -1913,7 +1978,6 @@ opt/app/node_modules/ee-first/package.json
opt/app/node_modules/ejs/lib/ejs.js
opt/app/node_modules/ejs/lib/utils.js
opt/app/node_modules/ejs/package.json
opt/app/node_modules/electron-to-chromium/package.json
opt/app/node_modules/electron-to-chromium/versions.js
opt/app/node_modules/emojis-list/index.js
opt/app/node_modules/emojis-list/package.json
@ -2239,7 +2303,6 @@ opt/app/node_modules/has-binary2/node_modules/isarray/package.json
opt/app/node_modules/has-binary2/package.json
opt/app/node_modules/has-flag/index.js
opt/app/node_modules/has-flag/package.json
opt/app/node_modules/has-symbols/package.json
opt/app/node_modules/has-symbols/shams.js
opt/app/node_modules/has-value/index.js
opt/app/node_modules/has-value/package.json
@ -2271,7 +2334,6 @@ opt/app/node_modules/htmlparser2/node_modules/entities/maps/decode.json
opt/app/node_modules/htmlparser2/node_modules/entities/maps/entities.json
opt/app/node_modules/htmlparser2/node_modules/entities/maps/legacy.json
opt/app/node_modules/htmlparser2/node_modules/entities/maps/xml.json
opt/app/node_modules/htmlparser2/node_modules/entities/package.json
opt/app/node_modules/htmlparser2/package.json
opt/app/node_modules/http-auth/package.json
opt/app/node_modules/http-auth/src/auth/base.js
@ -2735,7 +2797,6 @@ opt/app/node_modules/mellow/lib/mellow.js
opt/app/node_modules/mellow/package.json
opt/app/node_modules/memory-fs/lib/join.js
opt/app/node_modules/memory-fs/lib/normalize.js
opt/app/node_modules/memory-fs/package.json
opt/app/node_modules/merge-descriptors/index.js
opt/app/node_modules/merge-descriptors/package.json
opt/app/node_modules/methods/index.js
@ -3894,35 +3955,27 @@ proc/cpuinfo
sandstorm-http-bridge
sandstorm-http-bridge-config
sandstorm-manifest
sbin
sbin/getty
usr/bin
usr/bin/asciidoctor
usr/bin/bash
usr/bin/cp
usr/bin/dash
usr/bin/env
usr/bin/git
usr/bin/git-receive-pack
usr/bin/git-upload-pack
usr/bin/iconv
usr/bin/less
usr/bin/ln
usr/bin/ls
usr/bin/mkdir
usr/bin/node
usr/bin/nodejs
usr/bin/npm
usr/bin/pager
usr/bin/python
usr/bin/python2.7
usr/bin/rm
usr/bin/ruby
usr/bin/sh
usr/bin/sleep
usr/bin/stat
usr/bin/sudo
usr/bin/touch
usr/bin/which
usr/bin/yes
usr/lib
usr/lib/git-core/git
usr/lib/git-core/git-upload-pack
usr/lib/node_modules/npm/bin/npm-cli.js
@ -3957,7 +4010,6 @@ usr/lib/node_modules/npm/lib/utils/no-progress-while-running.js
usr/lib/node_modules/npm/lib/utils/output.js
usr/lib/node_modules/npm/lib/utils/parse-json.js
usr/lib/node_modules/npm/lib/utils/perf.js
usr/lib/node_modules/npm/lib/utils/replace-info.js
usr/lib/node_modules/npm/lib/utils/spawn.js
usr/lib/node_modules/npm/lib/utils/umask.js
usr/lib/node_modules/npm/lib/utils/unsupported.js
@ -4147,7 +4199,6 @@ usr/lib/node_modules/npm/node_modules/jsonparse/package.json
usr/lib/node_modules/npm/node_modules/latest-version/index.js
usr/lib/node_modules/npm/node_modules/latest-version/package.json
usr/lib/node_modules/npm/node_modules/libnpm/fetch.js
usr/lib/node_modules/npm/node_modules/libnpm/package.json
usr/lib/node_modules/npm/node_modules/lowercase-keys/index.js
usr/lib/node_modules/npm/node_modules/lowercase-keys/package.json
usr/lib/node_modules/npm/node_modules/lru-cache/index.js
@ -4162,8 +4213,6 @@ usr/lib/node_modules/npm/node_modules/meant/index.js
usr/lib/node_modules/npm/node_modules/meant/package.json
usr/lib/node_modules/npm/node_modules/minimatch/minimatch.js
usr/lib/node_modules/npm/node_modules/minimatch/package.json
usr/lib/node_modules/npm/node_modules/minimist/index.js
usr/lib/node_modules/npm/node_modules/minimist/package.json
usr/lib/node_modules/npm/node_modules/mkdirp/index.js
usr/lib/node_modules/npm/node_modules/mkdirp/package.json
usr/lib/node_modules/npm/node_modules/node-fetch-npm/package.json
@ -4248,6 +4297,8 @@ usr/lib/node_modules/npm/node_modules/proto-list/package.json
usr/lib/node_modules/npm/node_modules/proto-list/proto-list.js
usr/lib/node_modules/npm/node_modules/rc/index.js
usr/lib/node_modules/npm/node_modules/rc/lib/utils.js
usr/lib/node_modules/npm/node_modules/rc/node_modules/minimist/index.js
usr/lib/node_modules/npm/node_modules/rc/node_modules/minimist/package.json
usr/lib/node_modules/npm/node_modules/rc/package.json
usr/lib/node_modules/npm/node_modules/read-cmd-shim/index.js
usr/lib/node_modules/npm/node_modules/read-cmd-shim/package.json
@ -4524,6 +4575,31 @@ 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/python3.5
usr/lib/python3.5/__pycache__/_collections_abc.cpython-35.pyc
usr/lib/python3.5/__pycache__/_sitebuiltins.cpython-35.pyc
usr/lib/python3.5/__pycache__/_sysconfigdata.cpython-35.pyc
usr/lib/python3.5/__pycache__/_weakrefset.cpython-35.pyc
usr/lib/python3.5/__pycache__/abc.cpython-35.pyc
usr/lib/python3.5/__pycache__/codecs.cpython-35.pyc
usr/lib/python3.5/__pycache__/genericpath.cpython-35.pyc
usr/lib/python3.5/__pycache__/io.cpython-35.pyc
usr/lib/python3.5/__pycache__/os.cpython-35.pyc
usr/lib/python3.5/__pycache__/posixpath.cpython-35.pyc
usr/lib/python3.5/__pycache__/site.cpython-35.pyc
usr/lib/python3.5/__pycache__/stat.cpython-35.pyc
usr/lib/python3.5/__pycache__/sysconfig.cpython-35.pyc
usr/lib/python3.5/encodings
usr/lib/python3.5/encodings/__pycache__/__init__.cpython-35.pyc
usr/lib/python3.5/encodings/__pycache__/aliases.cpython-35.pyc
usr/lib/python3.5/encodings/__pycache__/ascii.cpython-35.pyc
usr/lib/python3.5/encodings/__pycache__/latin_1.cpython-35.pyc
usr/lib/python3.5/encodings/__pycache__/utf_8.cpython-35.pyc
usr/lib/python3.5/plat-x86_64-linux-gnu
usr/lib/python3.5/plat-x86_64-linux-gnu/__pycache__/_sysconfigdata_m.cpython-35.pyc
usr/lib/python3.5/posixpath.py
usr/lib/python3.5/site.py
usr/lib/python3.5/sysconfig.py
usr/lib/ruby/vendor_ruby/asciidoctor.rb
usr/lib/ruby/vendor_ruby/asciidoctor/abstract_block.rb
usr/lib/ruby/vendor_ruby/asciidoctor/abstract_node.rb
@ -4544,90 +4620,39 @@ usr/lib/ruby/vendor_ruby/asciidoctor/version.rb
usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
usr/lib/sudo/libsudo_util.so.0
usr/lib/sudo/libsudo_util.so.0.0.0
usr/lib/terminfo/d/dumb
usr/lib/x86_64-linux-gnu/gconv/ISO8859-1.so
usr/lib/x86_64-linux-gnu/gconv/gconv-modules.cache
usr/lib/x86_64-linux-gnu/ld-2.28.so
usr/lib/x86_64-linux-gnu/libacl.so.1
usr/lib/x86_64-linux-gnu/libacl.so.1.1.2253
usr/lib/x86_64-linux-gnu/libattr.so.1
usr/lib/x86_64-linux-gnu/libattr.so.1.1.2448
usr/lib/x86_64-linux-gnu/libaudit.so.1
usr/lib/x86_64-linux-gnu/libaudit.so.1.0.0
usr/lib/x86_64-linux-gnu/libbsd.so.0
usr/lib/x86_64-linux-gnu/libbz2.so.1.0
usr/lib/x86_64-linux-gnu/libbz2.so.1.0.4
usr/lib/x86_64-linux-gnu/libc-2.28.so
usr/lib/x86_64-linux-gnu/libc.so.6
usr/lib/x86_64-linux-gnu/libcap-ng.so.0
usr/lib/x86_64-linux-gnu/libcap-ng.so.0.0.0
usr/lib/x86_64-linux-gnu/libcrypt.so.1
usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
usr/lib/x86_64-linux-gnu/libdl-2.28.so
usr/lib/x86_64-linux-gnu/libdl.so.2
usr/lib/x86_64-linux-gnu/libedit.so.2
usr/lib/x86_64-linux-gnu/libedit.so.2.0.55
usr/lib/x86_64-linux-gnu/libelf-0.168.so
usr/lib/x86_64-linux-gnu/libelf.so.1
usr/lib/x86_64-linux-gnu/libexpat.so.1
usr/lib/x86_64-linux-gnu/libgcc_s.so.1
usr/lib/x86_64-linux-gnu/libglib-2.0.so.0
usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0
usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0.5000.3
usr/lib/x86_64-linux-gnu/libgmp.so.10
usr/lib/x86_64-linux-gnu/liblzma.so.5
usr/lib/x86_64-linux-gnu/libm-2.28.so
usr/lib/x86_64-linux-gnu/libm.so.6
usr/lib/x86_64-linux-gnu/libnsl-2.28.so
usr/lib/x86_64-linux-gnu/libnsl.so.1
usr/lib/x86_64-linux-gnu/libnss_compat-2.28.so
usr/lib/x86_64-linux-gnu/libnss_compat.so.2
usr/lib/x86_64-linux-gnu/libnss_dns-2.28.so
usr/lib/x86_64-linux-gnu/libnss_dns.so.2
usr/lib/x86_64-linux-gnu/libnss_files-2.28.so
usr/lib/x86_64-linux-gnu/libnss_files.so.2
usr/lib/x86_64-linux-gnu/libnss_nis-2.28.so
usr/lib/x86_64-linux-gnu/libnss_nis.so.2
usr/lib/x86_64-linux-gnu/libpcre.so.3
usr/lib/x86_64-linux-gnu/libpcre.so.3.13.3
usr/lib/x86_64-linux-gnu/libpcre2-8.so.0
usr/lib/x86_64-linux-gnu/libpcre2-8.so.0.7.1
usr/lib/x86_64-linux-gnu/libpopt.so.0
usr/lib/x86_64-linux-gnu/libpopt.so.0.0.0
usr/lib/x86_64-linux-gnu/libpthread-2.28.so
usr/lib/x86_64-linux-gnu/libpthread.so.0
usr/lib/x86_64-linux-gnu/libreadline.so.7
usr/lib/x86_64-linux-gnu/libreadline.so.7.0
usr/lib/x86_64-linux-gnu/libresolv-2.28.so
usr/lib/x86_64-linux-gnu/libresolv.so.2
usr/lib/x86_64-linux-gnu/librt-2.28.so
usr/lib/x86_64-linux-gnu/librt.so.1
usr/lib/x86_64-linux-gnu/libselinux.so.1
usr/lib/x86_64-linux-gnu/libicudata.so.57
usr/lib/x86_64-linux-gnu/libicudata.so.57.1
usr/lib/x86_64-linux-gnu/libicui18n.so.57
usr/lib/x86_64-linux-gnu/libicui18n.so.57.1
usr/lib/x86_64-linux-gnu/libicuuc.so.57
usr/lib/x86_64-linux-gnu/libicuuc.so.57.1
usr/lib/x86_64-linux-gnu/libssl.so.1.1
usr/lib/x86_64-linux-gnu/libstdc++.so.6
usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.25
usr/lib/x86_64-linux-gnu/libtinfo.so.6
usr/lib/x86_64-linux-gnu/libtinfo.so.6.1
usr/lib/x86_64-linux-gnu/libutil.so.1
usr/lib/x86_64-linux-gnu/libuuid.so.1
usr/lib/x86_64-linux-gnu/libuuid.so.1.3.0
usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.22
usr/lib/x86_64-linux-gnu/libxml2.so.2
usr/lib/x86_64-linux-gnu/libxml2.so.2.9.4
usr/lib/x86_64-linux-gnu/libz.so.1
usr/lib/x86_64-linux-gnu/libz.so.1.2.11
usr/lib64
usr/lib64/ld-linux-x86-64.so.2
usr/local/bin
usr/local/bin/getPublicId
usr/local/bin/hugo
usr/local/lib/python2.7/dist-packages
usr/local/sbin
usr/sbin
usr/sbin/getty
usr/share/git-core/templates
usr/share/git-core/templates/branches
usr/share/git-core/templates/description
usr/share/git-core/templates/hooks
usr/share/git-core/templates/hooks/applypatch-msg.sample
usr/share/git-core/templates/hooks/commit-msg.sample
usr/share/git-core/templates/hooks/fsmonitor-watchman.sample
usr/share/git-core/templates/hooks/post-update.sample
usr/share/git-core/templates/hooks/pre-applypatch.sample
usr/share/git-core/templates/hooks/pre-commit.sample

View File

@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "Hugo"),
appVersion = 48, # Increment this for every release.
appVersion = 4, # Increment this for every release.
appMarketingVersion = (defaultText = (embed "app-marketing-version")),
appMarketingVersion = (defaultText = "0.69.0~2020-04-21"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.

View File

@ -5,16 +5,17 @@
set -euo pipefail
export HUGO_VERSION=$(cat /opt/app/hugo-version)
export NODE_VERSION=$(cat /opt/app/.nvmrc)
export HUGO_VERSION=0.69.0
export NODE_VERSION=10
apt-get update
apt-get install -y git
apt-get install -y g++ autoconf pkg-config libtool
# First, get capnproto from master and install it to
# /usr/local/bin. This requires a C++ compiler. clang wasn't working
# well with building getPublicId so I switched to g++.
# /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
if [ ! -e capnproto ]; then git clone https://github.com/capnproto/capnproto; fi
cd capnproto
@ -43,6 +44,6 @@ apt-get install -y python-pip asciidoctor
pip install pygments
cd /tmp
wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb -O hugo.deb
wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.deb -O hugo.deb
dpkg -i hugo.deb
rm hugo.deb

View File

@ -1,56 +1,3 @@
## 0.104.2
* Upgrade Hugo to 0.104.2 extended
## 0.100.2
* Upgrade Hugo to 0.100.2 extended
## 0.99.1
* Upgrade Hugo to 0.99.1 extended
## 0.95.0
* Upgrade Hugo to 0.95.0 extended
## 0.93.0
* Upgrade Hugo to 0.93.0 extended
## 0.91.2
* Upgrade Hugo to 0.91.2 extended
## 0.90.1
* Upgrade Hugo to 0.90.1 extended
## 0.90.0
* Upgrade Hugo to 0.90.0 extended
## 0.89.4
* Upgrade Hugo to 0.89.4 extended
## 0.88.1 (2021-10-12)
* Upgrade Hugo to 0.88.1 extended
## 0.83.1 (2021-06-12)
* Upgrade Hugo to 0.83.1 extended
* More automation around packing/publish Hugo spk
## 0.79.1 (2020-12-22)
* Upgrade Hugo to 0.79.1 to deal with security issue
## 0.74.3 (2020-07-28)
* Upgrade Hugo to 0.74.3
## 0.69.0 (2020-04-21)
### Enhancements

View File

@ -1,3 +0,0 @@
source 'https://rubygems.org'
gem 'httparty'

View File

@ -1,19 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
httparty (0.20.0)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
multi_xml (0.6.0)
PLATFORMS
x86_64-linux
DEPENDENCIES
httparty
BUNDLED WITH
2.3.3

View File

@ -1,9 +1,7 @@
_Use [this fork](https://github.com/ocdtrekkie/hugo-sandstorm) of the project instead!_
# Hugo Sandstorm package
This is the [Sandstorm](https://sandstorm.io) package of [Hugo](https://gohugo.io/).
The version of Hugo in this build is listed in `hugo-version`.
The version of Hugo in this build is 0.69.0.
## Development
@ -27,24 +25,12 @@ git clone https://github.com/sandstorm-io/vagrant-spk
git clone https://github.com/johnbintz/hugo-sandstorm
export PATH=$(pwd)/vagrant-spk:$PATH
cd hugo-sandstorm
bin/test_hugo
vagrant-spk vm up
vagrant-spk dev
```
Visit [http://local.sandstorm.io:6090/](http://local.sandstorm.io:6090/) in a web browser.
Visit [http://local.sandstorm.io:6080/](http://local.sandstorm.io:6080/) in a web browser.
Note: when you want to fork this repo and create actual app packages for the app
store you would need either the original app key or
[create a new one and make your own version of the app](https://docs.sandstorm.io/en/latest/developing/publishing-apps/).
## Upgrades
* You'll need Ruby 2.6 and `gem install httparty`.
* Run `bin/upgrade_hugo <new version>`.
* Follow the directions.
## Pack and publish
* Run `bin/update_changelogs` to update changelogs for the package
* Run `bin/pack_hugo` to create an spk in the parent directory to ths one
* Try loading that spk into a separate Sandstorm instance for testing
* If it works, run `bin/publish_hugo` to publish that version to the App Market

View File

@ -1,5 +0,0 @@
#!/bin/sh
vagrant-spk vm up
vagrant-spk pack ../hugo-sandstorm-$(cat hugo-version).spk
vagrant-spk vm halt

View File

@ -1,10 +0,0 @@
#!/bin/sh
if [ ! -f ../hugo-sandstorm-$(cat hugo-version).spk ]; then
echo "You need to bin/pack_hugo first!"
exit 1
fi
vagrant-spk vm up
vagrant-spk publish ../hugo-sandstorm-$(cat hugo-version).spk
vagrant-spk vm halt

View File

@ -1,21 +0,0 @@
#!/bin/bash
build_only=$1
cd .sandstorm
vagrant destroy -f
cd ..
# this will fail
vagrant-spk vm up
# guest additions seems to require a reboot now...
vagrant-spk vm halt
vagrant-spk vm up
xdg-open http://local.sandstorm.io:6090/
vagrant-spk dev
echo "If everything went well:"
echo
echo "bin/pack_hugo"

View File

@ -1,28 +0,0 @@
#!/usr/bin/env ruby
SANDSTORM_CHANGELOG = ".sandstorm/changelog.md"
CHANGELOG = "CHANGELOG.md"
SANDSTORM_VERSION_FILE = ".sandstorm/app-marketing-version"
HUGO_VERSION_FILE = "hugo-version"
HUGO_VERSION = File.read(HUGO_VERSION_FILE).chomp
[
[SANDSTORM_CHANGELOG, SANDSTORM_VERSION_FILE],
[CHANGELOG, HUGO_VERSION_FILE]
].each do |(changelog, version_file)|
data = File.readlines(changelog).map(&:chomp)
version = File.read(version_file).chomp
unless data.any? { |line| line[version] }
data = [
"## #{version}",
"",
"* Upgrade Hugo to #{HUGO_VERSION} extended",
""
].concat(data)
File.open(changelog, 'w') { |fh| fh.print data.join("\n") + "\n" }
end
end

View File

@ -1,50 +0,0 @@
#!/usr/bin/env ruby
require 'httparty'
require 'time'
version = ARGV[0]
unless version
puts "Usage: #{$0} <version>"
exit 1
end
verify_url = "https://github.com/gohugoio/hugo/releases/download/v#{version}/hugo_extended_#{version}_linux-amd64.deb"
response = HTTParty.get(verify_url)
unless response.code >= 200 && response.code < 300
puts 'Error verifying release exists!'
puts " URL checked: #{verify_url}"
puts " Response code: #{response.code}"
exit 1
end
puts "#{version} exists, updating files"
today = Time.now.strftime('%Y-%m-%d')
File.open('hugo-version', 'w') { |fh| fh.puts version }
File.open('.sandstorm/app-marketing-version', 'w') { |fh| fh.puts "#{version}~#{today}" }
lines = File.readlines('.sandstorm/sandstorm-pkgdef.capnp')
lines = lines.map do |line|
next line unless line['appVersion']
line.gsub(/= ([0-9]+),/) { |_m| "= #{Regexp.last_match(1).to_i + 1}," }
end
File.open('.sandstorm/sandstorm-pkgdef.capnp', 'w') { |fh| fh.print lines.join }
puts <<~TXT
Now do this:
* bin/test_hugo
* Test fresh install
* bin/pack_hugo
* Test upgrade install
TXT

View File

@ -1 +0,0 @@
0.104.2

View File

@ -1,12 +1,9 @@
var fs = require('fs')
var hugoVersion = fs.readFileSync('hugo-version').toString()
module.exports = {
/*
** Headers of the page
*/
head: {
titleTemplate: `%s - hugo-standstorm v${hugoVersion}`,
titleTemplate: "%s - Hugo",
meta: [
{ charset: 'utf-8' },
{ name: 'viewport', content: 'width=device-width, initial-scale=1' }
@ -16,8 +13,7 @@ module.exports = {
** Add env variables
*/
env: {
baseURL: process.env.BASE_URL || "http://127.0.0.1:8000",
hugoVersion: hugoVersion
baseURL: process.env.BASE_URL || "http://127.0.0.1:8000"
},
plugins: [
"~plugins/sandstorm"

View File

@ -1,6 +1,5 @@
<template>
<div>
<h1>hugo-sandstorm version {{hugoVersion}} extended</h1>
<template v-if="isLoading">
<p>
Loading public site information. This may take a while!
@ -59,6 +58,26 @@
<render-template
rpcId="gitPush"
:template="'git remote add origin ' + this.gitUrl + '\ngit push -fu origin master'"/>
<h2>Upgrade notes from the 0.20 Sandstorm release:</h2>
<ul>
<li>
If you were using inline HTML in any Markdown files, enter the following into
your <code>config.toml</code> file:
<pre>
[markup.goldmark.renderer]
unsafe= true
</pre>
</li>
<li>
There have been updates/changes to how previous/next item handling has
changed over time. Ensure your previous/next item handling is
working as intended.
</li>
</ul>
<p>
Be sure to <a href="https://gohugo.io/news/" target="_blank" rel="noopener">read through the Hugo release notes</a>
if you notice any other odd behavior after upgrading.
</p>
<h2>Admin Interface (<a href="https://cloudcmd.io/" target="_blank" rel="noopener">Cloud Commander</a>)</h2>
<a :class="{disabled: !dirty}" class="button" @click="commitLocal">Commit &amp; publish local changes</a>
<a :class="{disabled: !dirty}" class="button" @click="deleteLocal">Delete local changes (git reset --hard)</a>
@ -78,8 +97,7 @@
publicId: "",
isLoading: true,
loadError: null,
dirty: false,
hugoVersion: process.env.hugoVersion
dirty: false
}),
computed: {
gitHost: () => {

View File

@ -1,6 +1,6 @@
# You may override the following vars on the command line to suit
# your config.
CXX=g++
CXX=clang++
CXXFLAGS=-O2 -Wall
# You generally should not modify these.