puppet: Move the removal of 30-postgresql-shm.conf into zulip::postgres_appdb

(imported from commit 6a4d089fd47a8ba6ea92eeac321e3077fa0d8cc4)
This commit is contained in:
Zev Benjamin 2013-11-12 17:34:52 -05:00 committed by Tim Abbott
parent cf7c468e74
commit c1bdb0c7a8
3 changed files with 5 additions and 10 deletions

View File

@ -12,6 +12,11 @@ class zulip::postgres_appdb {
}
safepackage { $appdb_packages: ensure => "installed" }
# We bundle a bunch of other sysctl parameters into 40-postgresql.conf
file { '/etc/sysctl.d/30-postgresql-shm.conf':
ensure => absent,
}
file { "/usr/local/bin/process_fts_updates":
ensure => file,
owner => "root",

View File

@ -8,11 +8,6 @@ class zulip_internal::postgres_master {
]
package { $master_packages: ensure => "installed" }
# We bundle a bunch of other sysctl parameters into 40-postgresql.conf
file { '/etc/sysctl.d/30-postgresql-shm.conf':
ensure => absent,
}
file { '/etc/sysctl.d/40-postgresql.conf':
ensure => file,
owner => 'root',

View File

@ -2,11 +2,6 @@ class zulip_internal::postgres_slave {
include zulip_internal::base
include zulip_internal::postgres_appdb
# We bundle a bunch of other sysctl parameters into 40-postgresql.conf
file { '/etc/sysctl.d/30-postgresql-shm.conf':
ensure => absent,
}
file { '/etc/sysctl.d/40-postgresql.conf':
ensure => file,
owner => 'root',