diff --git a/conf/yarn b/conf/yarn index 52d99447..65d914b8 100755 --- a/conf/yarn +++ b/conf/yarn @@ -5,5 +5,10 @@ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key --keyring /usr/share mv /etc/apt/sources.list.d/yarn.list.disabled /etc/apt/sources.list.d/yarn.list +YARN="yarn" +if [[ -n "$YARN_VER" ]]; then + YARN="$YARN=YARN_VER" +fi + apt-get update -DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes yarn +DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes "$YARN" diff --git a/mk/turnkey.mk b/mk/turnkey.mk index be27f7d7..5b32b4f6 100644 --- a/mk/turnkey.mk +++ b/mk/turnkey.mk @@ -6,7 +6,7 @@ HOSTNAME ?= $(shell basename "$(shell pwd)") # general TKL vars CONF_VARS += HOSTNAME ROOT_PASS NONFREE BACKPORTS_NONFREE TKL_TESTING BACKPORTS # set specific software versions -CONF_VARS += PHP_VERSION RUBY_VER NODE_VER +CONF_VARS += PHP_VERSION RUBY_VER NODE_VER YARN_VER # Webmin/firewall related CONF_VARS += WEBMIN_THEME WEBMIN_FW_TCP_INCOMING WEBMIN_FW_TCP_INCOMING_REJECT WEBMIN_FW_UDP_INCOMING WEBMIN_FW_NAT_EXTRA WEBMIN_FW_MANGLE_EXTRA # these are needed to control styling of credits (e.g., conf/apache-credit)