paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

puppet: Add basic configuration for Ubuntu bionic.

Browse Source
This commit is contained in:
Tim Abbott
2018-05-05 10:31:45 -07:00
parent b193330474
commit 8ea8bfe285
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ class zulip::base {
'15.04' => 'vivid', '15.04' => 'vivid',
'15.10' => 'wily', '15.10' => 'wily',
'16.04' => 'xenial', '16.04' => 'xenial',
'18.04' => 'bionic',
} }
$postgres_version = $release_name ? { $postgres_version = $release_name ? {
@@ -48,6 +49,7 @@ class zulip::base {
'vivid' => '9.4', 'vivid' => '9.4',
'wily' => '9.4', 'wily' => '9.4',
'xenial' => '9.5', 'xenial' => '9.5',
'bionic' => '10',
} }
$normal_queues = [ $normal_queues = [

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

@@ -3,6 +3,8 @@ class zulip::static_asset_compiler {
$closure_compiler_package = 'libclosure-compiler-java' $closure_compiler_package = 'libclosure-compiler-java'
} elsif $zulip::base::release_name == 'xenial' { } elsif $zulip::base::release_name == 'xenial' {
$closure_compiler_package = 'closure-compiler' $closure_compiler_package = 'closure-compiler'
} elsif $zulip::base::release_name == 'bionic' {
$closure_compiler_package = 'closure-compiler'
} elsif $zulip::base::release_name == 'stretch' { } elsif $zulip::base::release_name == 'stretch' {
$closure_compiler_package = 'closure-compiler' $closure_compiler_package = 'closure-compiler'
} }

8
tools/lib/provision.py
View File

@@ -111,6 +111,7 @@ POSTGRES_VERSION_MAP = {
"trusty": "9.3", "trusty": "9.3",
"xenial": "9.5", "xenial": "9.5",
"zesty": "9.6", "zesty": "9.6",
"bionic": "10",
} }
POSTGRES_VERSION = POSTGRES_VERSION_MAP[codename] POSTGRES_VERSION = POSTGRES_VERSION_MAP[codename]
@@ -154,9 +155,10 @@ APT_DEPENDENCIES = {
"postgresql-9.5-pgroonga", "postgresql-9.5-pgroonga",
"virtualenv", # see comment on stretch "virtualenv", # see comment on stretch
], ],
"zesty": UBUNTU_COMMON_APT_DEPENDENCIES + [ "bionic": UBUNTU_COMMON_APT_DEPENDENCIES + [
"postgresql-9.6", "postgresql-10",
"postgresql-9.6-pgroonga", "postgresql-10-pgroonga",
"postgresql-10-tsearch-extras",
"virtualenv", # see comment on stretch "virtualenv", # see comment on stretch
], ],
} }