summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-12-31 16:03:36 +0000
committerintrigeri <intrigeri@boum.org>2019-12-31 16:08:25 +0000
commit7ee190b26f6cab67c4f744b3d7ad899fc1e0ab36 (patch)
treef0253a80e23fbdddb48d24af9820a2dc24bbe7d2 /vagrant
parentb0fc0ae46e3f3292264396e1645869f95f3aab1b (diff)
Replace all new occurrences of "wiki" with "website" (refs: #15342)
Our website has not exactly been a wiki for many years now, and thus we've been slowly moving from this terminology to "website".
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/provision/assets/build-tails16
1 files changed, 8 insertions, 8 deletions
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index fa534af..e80fb89 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -156,14 +156,14 @@ as_root_do rsync -a "${TAILS_GIT_DIR}"/ "${BUILD_DIR}"/
cd "${BUILD_DIR}"
-if [ "${TAILS_WIKI_CACHE}" = 1 ]; then
- WIKI_CACHE_SRC_DIR="/var/cache/apt-cacher-ng/wiki-cache"
- WIKI_CACHE_TARGETS="
+if [ "${TAILS_WEBSITE_CACHE}" = 1 ]; then
+ WEBSITE_CACHE_SRC_DIR="/var/cache/apt-cacher-ng/website-cache"
+ WEBSITE_CACHE_TARGETS="
wiki
config/chroot_local-includes/usr/share/doc/tails/website
"
- for target in ${WIKI_CACHE_TARGETS}; do
- source="${WIKI_CACHE_SRC_DIR}"/"$(basename "${target}")"
+ for target in ${WEBSITE_CACHE_TARGETS}; do
+ source="${WEBSITE_CACHE_SRC_DIR}"/"$(basename "${target}")"
if [ -d "${source}" ]; then
mkdir -p "${target}"
rm -rf "${target}"
@@ -172,9 +172,9 @@ if [ "${TAILS_WIKI_CACHE}" = 1 ]; then
fi
done
./build-website
- as_root_do rm -rf "${WIKI_CACHE_SRC_DIR}"
- as_root_do mkdir -p "${WIKI_CACHE_SRC_DIR}"
- as_root_do cp -a ${WIKI_CACHE_TARGETS} "${WIKI_CACHE_SRC_DIR}"
+ as_root_do rm -rf "${WEBSITE_CACHE_SRC_DIR}"
+ as_root_do mkdir -p "${WEBSITE_CACHE_SRC_DIR}"
+ as_root_do cp -a ${WEBSITE_CACHE_TARGETS} "${WEBSITE_CACHE_SRC_DIR}"
fi
as_root_do lb config --cache false