Drupal 7.10

.gitignore

@@ -1,6 +1,28 @@
-# Ignore configuration files that may contain sensitive information.
-sites/*/settings*.php
+# Drupal #
+##########
+sites/*/files/*
+files/*
 
-# Ignore paths that contain user-generated content.
-sites/*/files
-sites/*/private
+# Packages #
+############
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+
+# OS generated files #
+######################
+.DS_Store?
+ehthumbs.db
+Icon?
+Thumbs.db
+._*

includes/bootstrap.inc

@@ -726,8 +726,25 @@ function drupal_settings_initialize() {
   if (file_exists(DRUPAL_ROOT . '/' . conf_path() . '/settings.php')) {
     include_once DRUPAL_ROOT . '/' . conf_path() . '/settings.php';
   }
+
   $is_https = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on';
 
+  // Load environmental config, if present.
+  if (isset($_SERVER['PRESSFLOW_SETTINGS'])) {
+    $pressflow_settings = json_decode($_SERVER['PRESSFLOW_SETTINGS'], TRUE);
+    foreach ($pressflow_settings as $key => $value) {
+      // One level of depth should be enough for $conf and $database.
+      if ($key == 'conf') {
+        foreach($value as $conf_key => $conf_value) {
+          $conf[$conf_key] = $value;
+        }
+      }
+      else {
+        $$key = $value;
+      }
+    }
+  }
+
   if (isset($base_url)) {
     // Parse fixed base URL from settings.php.
     $parts = parse_url($base_url);
@@ -2329,6 +2346,17 @@ function _drupal_bootstrap_database() {
 function _drupal_bootstrap_variables() {
   global $conf;
 
+  // Pressflow Smart Start
+  if (!empty($GLOBALS['databases']) && variable_get('pressflow_smart_start', FALSE)) {
+    try {
+      $result = db_query('SELECT s.name FROM {system} s WHERE s.name = :name', array(':name' => 'system'));
+    } catch (Exception $e) {
+      // Redirect to the installer if an essential table is missing.
+      include_once DRUPAL_ROOT . '/includes/install.inc';
+      install_goto('install.php');
+    }
+  }
+
   // Initialize the lock system.
   require_once DRUPAL_ROOT . '/' . variable_get('lock_inc', 'includes/lock.inc');
   lock_initialize();

misc/healthchecks/db.check.php

@@ -0,0 +1,24 @@
+<?php
+// Load environmental config, if present.
+if (isset($_SERVER['PRESSFLOW_SETTINGS'])) {
+  $pressflow_config = json_decode($_SERVER['PRESSFLOW_SETTINGS'], TRUE);
+  $db = $pressflow_config['databases']['default']['default'];
+  $link = mysql_connect($db['host'] . ':' . $db['port'], $db['username'], $db['password']);
+  if (!$link) {
+      fail('Could not connect: ' . mysql_error());
+  }
+  echo "OK\n";
+  mysql_close($link);
+}
+else {
+  fail("No config found.\n");
+}
+
+/**
+ * Fail with a status code.
+ */
+function fail($message, $code = 500) {
+  header(sprintf("HTTP/1.0 %s %s", $code, $message));
+  echo $message;
+  exit;
+}

misc/healthchecks/static.check.txt

@@ -0,0 +1 @@
+OK