Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

install: Ad production support for Zulip on Ubuntu Focal. 

Install script now runs on Focal.  Python 2 is now installed via the
`python2` package in Focal.
This commit is contained in:
arpit551 2020-05-21 01:43:57 +05:30 committed by Tim Abbott
parent 3971824d04
commit 439f0d3004
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/zulip/manifests/base.pp
View File

@ -15,6 +15,7 @@ class zulip::base {
'15.10' => 'wily', '15.10' => 'wily',
'16.04' => 'xenial', '16.04' => 'xenial',
'18.04' => 'bionic', '18.04' => 'bionic',
'20.04' => 'focal',
} }
$base_packages = [ $base_packages = [
# Accurate time is essential # Accurate time is essential
@ -67,6 +68,7 @@ class zulip::base {
'xenial' => '9.5', 'xenial' => '9.5',
'bionic' => '10', 'bionic' => '10',
'CentOS7' => '10', 'CentOS7' => '10',
'focal' => '12',
}) })
$normal_queues = [ $normal_queues = [

10
scripts/lib/install
View File

@ -105,7 +105,7 @@ if [ -f /etc/os-release ]; then
fi fi
case "$os_id$os_version_id" in case "$os_id$os_version_id" in
ubuntu16.04|ubuntu18.04|debian9|debian10) ;; ubuntu16.04|ubuntu18.04|debian9|debian10|ubuntu20.04) ;;
*) *)
set +x set +x
cat <<EOF cat <<EOF
@ -203,9 +203,15 @@ fi
case " $os_id $os_id_like " in case " $os_id $os_id_like " in
*' debian '*) *' debian '*)
if [ "$os_id" = ubuntu ] && [ "$os_version_id" = 20.04 ]; then
PYTHON2="python2"
else
PYTHON2="python"
fi
if ! apt-get install -y \ if ! apt-get install -y \
puppet git curl wget jq \ puppet git curl wget jq \
python python3 python-six python3-six crudini \ "$PYTHON2" python3 python-six python3-six crudini \
"${ADDITIONAL_PACKAGES[@]}"; then "${ADDITIONAL_PACKAGES[@]}"; then
set +x set +x
echo -e '\033[0;31m' >&2 echo -e '\033[0;31m' >&2