From 057c4ab747911c720a211ebb30a886d5abc380d5 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Mon, 9 Jun 2025 11:18:39 +1000
Subject: [PATCH] feat: manage nginx resource ordering (#311)

- ensure the package is installed before creating directories
- ensure nginx is restarted when vhost config changes

Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/311
---
 site/profiles/manifests/edgecache/nginx.pp   | 15 ++++++++++-----
 site/profiles/manifests/nginx/simpleproxy.pp |  6 +++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/site/profiles/manifests/edgecache/nginx.pp b/site/profiles/manifests/edgecache/nginx.pp
index 970d43a..fd6e413 100644
--- a/site/profiles/manifests/edgecache/nginx.pp
+++ b/site/profiles/manifests/edgecache/nginx.pp
@@ -92,10 +92,11 @@ class profiles::edgecache::nginx {
   # ensure the requires directories exist
   $profiles::edgecache::params::directories.each |$name,$data| {
     file { $name:
-      ensure => 'directory',
-      before => Class['nginx'],
-      mode   => '0775',
-      *      => $data,
+      ensure  => 'directory',
+      before  => Class['nginx::config'],
+      require => Class['nginx::package'],
+      mode    => '0775',
+      *       => $data,
     }
   }
 
@@ -131,6 +132,10 @@ class profiles::edgecache::nginx {
   service { 'nginx':
     ensure    => true,
     enable    => true,
-    subscribe => [File[$selected_ssl_cert], File[$selected_ssl_key]],
+    subscribe => [
+      File[$selected_ssl_cert],
+      File[$selected_ssl_key],
+      Nginx::Resource::Server[$nginx_vhost]
+    ],
   }
 }
diff --git a/site/profiles/manifests/nginx/simpleproxy.pp b/site/profiles/manifests/nginx/simpleproxy.pp
index 5da5181..25287f8 100644
--- a/site/profiles/manifests/nginx/simpleproxy.pp
+++ b/site/profiles/manifests/nginx/simpleproxy.pp
@@ -137,7 +137,11 @@ class profiles::nginx::simpleproxy (
     service { 'nginx':
       ensure    => true,
       enable    => true,
-      subscribe => [File[$selected_ssl_cert], File[$selected_ssl_key]],
+      subscribe => [
+        File[$selected_ssl_cert],
+        File[$selected_ssl_key],
+        Nginx::Resource::Server[$nginx_vhost]
+      ],
     }
   }
 }