From c1bdb0c7a8f092e269b770df85e4a8ea83c853a8 Mon Sep 17 00:00:00 2001
From: Zev Benjamin <zev@zulip.com>
Date: Tue, 12 Nov 2013 17:34:52 -0500
Subject: [PATCH] puppet: Move the removal of 30-postgresql-shm.conf into
 zulip::postgres_appdb

(imported from commit 6a4d089fd47a8ba6ea92eeac321e3077fa0d8cc4)
---
 puppet/zulip/manifests/postgres_appdb.pp           | 5 +++++
 puppet/zulip_internal/manifests/postgres_master.pp | 5 -----
 puppet/zulip_internal/manifests/postgres_slave.pp  | 5 -----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/puppet/zulip/manifests/postgres_appdb.pp b/puppet/zulip/manifests/postgres_appdb.pp
index 84aa430a23..f5d22a1931 100644
--- a/puppet/zulip/manifests/postgres_appdb.pp
+++ b/puppet/zulip/manifests/postgres_appdb.pp
@@ -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",
diff --git a/puppet/zulip_internal/manifests/postgres_master.pp b/puppet/zulip_internal/manifests/postgres_master.pp
index d784a2aced..c6138decdc 100644
--- a/puppet/zulip_internal/manifests/postgres_master.pp
+++ b/puppet/zulip_internal/manifests/postgres_master.pp
@@ -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',
diff --git a/puppet/zulip_internal/manifests/postgres_slave.pp b/puppet/zulip_internal/manifests/postgres_slave.pp
index 5bf91d200e..2064f9a46f 100644
--- a/puppet/zulip_internal/manifests/postgres_slave.pp
+++ b/puppet/zulip_internal/manifests/postgres_slave.pp
@@ -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',