Only force the prefork mpm when mod_php is used

[chef.git] / roles / scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index 76b4b78e1ae2e0eadb8f7056e40d6ab72baa3872..876fb6905f4d8c4016b3040f00c14eb0c75a034a 100644 (file)
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -2,9 +2,6 @@ name "scorch"
 description "Master role applied to scorch"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",
@@ -24,7 +21,6 @@ default_attributes(
     }
   },
   :networking => {
-    :netplan => true,
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
@@ -45,7 +41,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -65,10 +60,9 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "12/main",
+      :postgis => "3"
     },
-    :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [