mirror of
https://github.com/zulip/zulip.git
synced 2025-10-27 01:53:59 +00:00
puppet: Do not bother manually symlinking hunspell dictionaries.
This code dates back to 57b52310639a; however, this has been handled
by `postgresql-common` adding a post-install trigger to call
`pg_updatedicts` for each new PostgreSQL version, since
`postgresql-common` version 153 (February 2014).
(cherry picked from commit 9def655564)
This commit is contained in:
committed by
Tim Abbott
parent
2b6058d5f7
commit
bc7ea80452
@@ -17,8 +17,6 @@ class zulip::postgresql_base {
|
||||
$pgroonga_setup_sql_path = "${postgresql_sharedir}/pgroonga_setup.sql"
|
||||
$setup_system_deps = 'setup_apt_repo'
|
||||
$postgresql_restart = "pg_ctlcluster ${zulip::postgresql_common::version} main restart"
|
||||
$postgresql_dict_dict = '/var/cache/postgresql/dicts/en_us.dict'
|
||||
$postgresql_dict_affix = '/var/cache/postgresql/dicts/en_us.affix'
|
||||
}
|
||||
'RedHat': {
|
||||
$postgresql = "postgresql${zulip::postgresql_common::version}"
|
||||
@@ -33,28 +31,12 @@ class zulip::postgresql_base {
|
||||
$pgroonga_setup_sql_path = "${postgresql_sharedir}/pgroonga_setup.sql"
|
||||
$setup_system_deps = 'setup_yum_repo'
|
||||
$postgresql_restart = "systemctl restart postgresql-${zulip::postgresql_common::version}"
|
||||
# TODO Since we can't find the PostgreSQL dicts directory on CentOS yet, we
|
||||
# link directly to the hunspell directory.
|
||||
$postgresql_dict_dict = '/usr/share/myspell/en_US.dic'
|
||||
$postgresql_dict_affix = '/usr/share/myspell/en_US.aff'
|
||||
}
|
||||
default: {
|
||||
fail('osfamily not supported')
|
||||
}
|
||||
}
|
||||
|
||||
file { "${tsearch_datadir}/en_us.dict":
|
||||
ensure => link,
|
||||
require => Package[$postgresql],
|
||||
target => $postgresql_dict_dict,
|
||||
tag => ['postgresql_upgrade'],
|
||||
}
|
||||
file { "${tsearch_datadir}/en_us.affix":
|
||||
ensure => link,
|
||||
require => Package[$postgresql],
|
||||
target => $postgresql_dict_affix,
|
||||
tag => ['postgresql_upgrade'],
|
||||
}
|
||||
file { "${tsearch_datadir}/zulip_english.stop":
|
||||
ensure => file,
|
||||
require => Package[$postgresql],
|
||||
|
||||
Reference in New Issue
Block a user