From b6acbe040c5bc80445c6d461d64994b3b70720af Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Thu, 12 Dec 2013 17:58:05 -0500
Subject: [PATCH] Fix missing nginx service notifications on configuration
 changes.

(imported from commit 0bfce276bab3704e508f6c8a58c9434e9fc224cd)
---
 puppet/zulip/manifests/enterprise.pp                    | 3 +++
 puppet/zulip_internal/manifests/loadbalancer.pp         | 3 +++
 puppet/zulip_internal/manifests/prod_app_frontend.pp    | 3 +++
 puppet/zulip_internal/manifests/staging_app_frontend.pp | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/puppet/zulip/manifests/enterprise.pp b/puppet/zulip/manifests/enterprise.pp
index e56454f33f..5f7d4214c7 100644
--- a/puppet/zulip/manifests/enterprise.pp
+++ b/puppet/zulip/manifests/enterprise.pp
@@ -19,10 +19,13 @@ class zulip::enterprise {
     group  => "root",
     mode => 644,
     source => "puppet:///modules/zulip/nginx/sites-available/zulip-enterprise",
+    notify => Service["nginx"],
   }
   file { '/etc/nginx/sites-enabled/zulip-enterprise':
+    require => Package["nginx-full"],
     ensure => 'link',
     target => '/etc/nginx/sites-available/zulip-enterprise',
+    notify => Service["nginx"],
   }
 
   file { '/home/zulip/prod-static':
diff --git a/puppet/zulip_internal/manifests/loadbalancer.pp b/puppet/zulip_internal/manifests/loadbalancer.pp
index b60b51968f..d178971a33 100644
--- a/puppet/zulip_internal/manifests/loadbalancer.pp
+++ b/puppet/zulip_internal/manifests/loadbalancer.pp
@@ -10,6 +10,7 @@ class zulip_internal::loadbalancer {
     group  => "root",
     mode => 644,
     source => "puppet:///modules/zulip_internal/nginx/sites-available/loadbalancer",
+    notify => Service["nginx"],
   }
 
   file { "/etc/motd":
@@ -21,8 +22,10 @@ class zulip_internal::loadbalancer {
   }
 
   file { '/etc/nginx/sites-enabled/loadbalancer':
+    require => Package["nginx-full"],
     ensure => 'link',
     target => '/etc/nginx/sites-available/loadbalancer',
+    notify => Service["nginx"],
   }
 
   file { "/etc/default/camo":
diff --git a/puppet/zulip_internal/manifests/prod_app_frontend.pp b/puppet/zulip_internal/manifests/prod_app_frontend.pp
index a979548112..0f19ecafed 100644
--- a/puppet/zulip_internal/manifests/prod_app_frontend.pp
+++ b/puppet/zulip_internal/manifests/prod_app_frontend.pp
@@ -9,10 +9,13 @@ class zulip_internal::prod_app_frontend {
     group  => "root",
     mode => 644,
     source => "puppet:///modules/zulip_internal/nginx/sites-available/zulip",
+    notify => Service["nginx"],
   }
   file { '/etc/nginx/sites-enabled/zulip':
+    require => Package["nginx-full"],
     ensure => 'link',
     target => '/etc/nginx/sites-available/zulip',
+    notify => Service["nginx"],
   }
 
   file { [ "/srv/www/", "/srv/www/dist/", "/srv/www/dist/api",
diff --git a/puppet/zulip_internal/manifests/staging_app_frontend.pp b/puppet/zulip_internal/manifests/staging_app_frontend.pp
index 0f88df3e64..207d9f3754 100644
--- a/puppet/zulip_internal/manifests/staging_app_frontend.pp
+++ b/puppet/zulip_internal/manifests/staging_app_frontend.pp
@@ -9,10 +9,13 @@ class zulip_internal::staging_app_frontend {
     group  => "root",
     mode => 644,
     source => "puppet:///modules/zulip_internal/nginx/sites-available/zulip-staging",
+    notify => Service["nginx"],
   }
   file { '/etc/nginx/sites-enabled/zulip-staging':
+    require => Package["nginx-full"],
     ensure => 'link',
     target => '/etc/nginx/sites-available/zulip-staging',
+    notify => Service["nginx"],
   }
   file { "/etc/cron.d/email-mirror":
     ensure => file,