add attribute and handling for preventing apache restarts after updat…

…ing files
etsy · May 10, 2023 · bf98411 · bf98411
1 parent b06054b
commit bf98411
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/cookbooks/fb_apache/attributes/default.rb b/cookbooks/fb_apache/attributes/default.rb
@@ -185,3 +185,5 @@
   },
   'mpm' => 'prefork',
 }
+
+node.default['fb_apache']['allow_restart'] = true
diff --git a/cookbooks/fb_apache/recipes/default.rb b/cookbooks/fb_apache/recipes/default.rb
@@ -224,7 +224,13 @@
   end
 end
 
+service 'apache_enable' do
+  service_name svc
+  action [:enable]
+end
+
 service 'apache' do
   service_name svc
-  action [:enable, :start]
+  only_if { node['fb_apache']['allow_restart'] }
+  action [:nothing]
 end
diff --git a/cookbooks/fb_apache/templates/default/status.erb b/cookbooks/fb_apache/templates/default/status.erb
@@ -1,3 +1,11 @@
-<Location "<%= @location %>">
+<Location /server-status>
     SetHandler server-status
+    Require local
+    # vpn users
+    Require ip 10.96.244.0/22
+    # vpn users
+    Require ip 10.100.240.0/22
+    # GCP vpn users
+    Require ip 10.0.0.0/8
+    Require ip 127.0.0.1
 </Location>