From aca25b6f0a69f4d21801bccac79c00b6872167a8 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Fri, 9 Feb 2018 16:20:26 -0800
Subject: [PATCH] puppet: Move ssh configuration to use notify.

This handles more correctly the case where we're using the upstream
sshd_config file.
---
 puppet/zulip_ops/manifests/base.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/puppet/zulip_ops/manifests/base.pp b/puppet/zulip_ops/manifests/base.pp
index fd6c0f642d..130fc18e31 100644
--- a/puppet/zulip_ops/manifests/base.pp
+++ b/puppet/zulip_ops/manifests/base.pp
@@ -81,6 +81,10 @@ class zulip_ops::base {
     mode       => 644,
   }
 
+  service { 'ssh':
+    ensure     => running,
+  }
+
   if $zulip::base::release_name == "xenial" {
     # Our custom sshd_config uses options that don't exist on trusty.
     file { '/etc/ssh/sshd_config':
@@ -90,14 +94,10 @@ class zulip_ops::base {
       owner      => 'root',
       group      => 'root',
       mode       => 644,
+      notify     => Service['ssh'],
     }
   }
 
-  service { 'ssh':
-    ensure     => running,
-    subscribe  => File['/etc/ssh/sshd_config'],
-  }
-
   file { '/root/.emacs':
     ensure     => file,
     mode       => 600,