fix ordering

halyard · Apr 7, 2024 · 0a12ac9 · 0a12ac9
1 parent 8c708c7
commit 0a12ac9
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -45,11 +45,6 @@
     table  => 'nat',
   }
 
-  file { "${datadir}/scripts/cache.py":
-    ensure => file,
-    source => 'puppet:///modules/frameproxy/cache.py',
-  }
-
   file { [
       $datadir,
       "${datadir}/cache",
@@ -59,28 +54,38 @@
       ensure => directory,
   }
 
-  -> acme::certificate { $proxy_hostname:
+  file { "${datadir}/scripts/cache.py":
+    ensure => file,
+    source => 'puppet:///modules/frameproxy/cache.py',
+  }
+
+  acme::certificate { $proxy_hostname:
     hook_script           => $proxy_hook_script,
     aws_access_key_id     => $proxy_aws_access_key_id,
     aws_secret_access_key => $proxy_aws_secret_access_key,
     email                 => $email,
   }
 
-  -> acme::certificate { $intercept_hostname:
+  acme::certificate { $intercept_hostname:
     hook_script           => $intercept_hook_script,
     aws_access_key_id     => $intercept_aws_access_key_id,
     aws_secret_access_key => $intercept_aws_secret_access_key,
     email                 => $email,
   }
 
-  -> docker::container { 'frameproxy':
-    image => 'mitmproxy/mitmproxy',
-    args  => [
+  docker::container { 'frameproxy':
+    image     => 'mitmproxy/mitmproxy',
+    args      => [
       "--ip ${ip}",
       "-v ${datadir}/cache:/opt/cache",
       "-v ${datadir}/tls:/opt/tls",
       "-v ${datadir}/scripts:/opt/scripts",
     ],
-    cmd   => join($command, ' '),
+    cmd       => join($command, ' '),
+    subscribe => [
+      File["${datadir}/scripts/cache.py"],
+      Acme::Certificate[$proxy_hostname],
+      Acme::Certificate[$intercept_hostname],
+    ],
   }
 }