From bc7ea8045290ca222cf4bb93d73274da1da1d09f Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Wed, 7 May 2025 13:22:07 -0400
Subject: [PATCH] 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 9def65556406cd521c19c68431d349d295ebe9d6)
---
 puppet/zulip/manifests/postgresql_base.pp | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/puppet/zulip/manifests/postgresql_base.pp b/puppet/zulip/manifests/postgresql_base.pp
index 59ca2a28e5..efcedca376 100644
--- a/puppet/zulip/manifests/postgresql_base.pp
+++ b/puppet/zulip/manifests/postgresql_base.pp
@@ -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],