Merge branch 'master' into 139-restrict-by-ip

.bp-config/httpd/extra/httpd-modules.conf

@@ -0,0 +1,25 @@
+# This file was built from
+# https://github.com/cloudfoundry/php-buildpack/blob/master/defaults/config/httpd/extra/httpd-modules.conf
+# For more detail, see the description in
+# https://docs.cloudfoundry.org/buildpacks/php/gsg-php-config.html#engine-configurations
+
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule env_module modules/mod_env.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule mpm_event_module modules/mod_mpm_event.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+LoadModule remoteip_module modules/mod_remoteip.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule filter_module modules/mod_filter.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule headers_module modules/mod_headers.so
+
+# Also enable proxy_http for our s3fs module
+LoadModule proxy_http_module modules/mod_proxy_http.so

.bp-config/options.json

@@ -0,0 +1,11 @@
+{
+  "COMPOSER_INSTALL_OPTIONS": [
+    "--no-dev --optimize-autoloader --no-progress --no-interaction"
+  ],
+  "COMPOSER_VENDOR_DIR": "vendor",
+  "WEBDIR": "web",
+  "PHP_EXTENSIONS": ["bz2", "curl", "gd", "mbstring", "mcrypt", "pdo", "pdo_mysql", "zip"],
+  "ADDITIONAL_PREPROCESS_CMDS": [
+    "$HOME/bootstrap.sh"
+  ]
+}

.bp-config/php/php.ini.d/memory_limit.ini

@@ -0,0 +1,3 @@
+; Maximum amount of memory a script may consume (128MB)
+; http://php.net/memory-limit
+memory_limit = 512M

.cfignore

@@ -0,0 +1,29 @@
+# Ignore directories generated by Composer
+/drush/contrib/
+/vendor/
+/web/core/
+/web/modules/contrib/
+/web/themes/contrib/
+/web/profiles/contrib/
+/web/libraries/
+
+# Typically, composer generates a .gitignore to ignore the 
+# `settings.php` files.  For cloud.gov and Cloud Foundry, no sensitive 
+# information is stored in the settings files. Instead, those files
+# have code that parses environment variables for DB and S3
+#
+# Ignore sensitive information [This is a `composer` default]
+# /web/sites/*/settings.php
+# /web/sites/*/settings.local.php
+
+
+# Ignore Drupal's file directory
+/web/sites/*/files/
+
+# Ignore SimpleTest multi-site environment.
+/web/sites/simpletest
+
+# Ignore files generated by PhpStorm
+/.idea/
+
+.DS_Store

.docker/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:7.1-apache
+
+# Set the DocumentRoot to /var/www/web instead of /var/www/html
+RUN sed -i 's/html/web/g' /etc/apache2/sites-available/000-default.conf
+
+RUN apt-get update &&\
+    apt-get install -y \
+      libbz2-dev libcurl4-openssl-dev libmcrypt-dev \
+      libwebp-dev libjpeg-dev libpng12-dev \
+      git jq wget mysql-client &&\
+    docker-php-ext-install bz2 curl gd mbstring mcrypt pdo pdo_mysql zip &&\
+    apt-get autoremove -y &&\
+    rm -rf /var/lib/apt/lists/* &&\
+    rm -rf /var/cache/apt/*
+
+RUN a2enmod rewrite proxy proxy_http
+
+COPY ["install-composer.sh", "/tmp"]
+RUN "/tmp/install-composer.sh"
+
+# Add composer-installed libs to path
+ENV PATH=/var/www/vendor/bin:$PATH

.docker/install-composer.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# from https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md
+set -e
+
+EXPECTED_SIGNATURE=$(wget -q -O - https://composer.github.io/installer.sig)
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', 'composer-setup.php');")
+
+if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]
+then
+    >&2 echo 'ERROR: Invalid installer signature'
+    rm composer-setup.php
+    exit 1
+fi
+
+php composer-setup.php --quiet
+RESULT=$?
+rm composer-setup.php
+mv composer.phar /usr/local/bin/composer
+exit $RESULT

.docker/startup

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+/var/www/.docker/wait_for_db_then /var/www/bootstrap.sh
+apache2-foreground

.docker/wait_for_db_then

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+FIRST_RUN=true
+
+until (echo 2>/dev/null > /dev/tcp/database/3306)
+do
+  echo "Startup: Waiting for MySQL..."
+  if $FIRST_RUN; then
+    echo -e "\tTo track progress, run:"
+    echo -e "\tdocker-compose logs -f database"
+    FIRST_RUN=false
+  fi
+  sleep 1
+done
+
+exec "$@"

.gitignore

@@ -16,9 +16,21 @@ core
 # Core's dependencies are managed with Composer.
 vendor
 
+# Ignore local versions of modules.
+modules/*
+web/modules/contrib/*
+web/themes/contrib/*
+
+# Ignore compiled twig templates
+storage/php
+
+# Ignore local database dumps.
+db_dumps
+
 # Ignore configuration files that may contain sensitive information.
-sites/*/settings*.php
+sites/*/*settings*.php*
 sites/*/services*.yml
+sites/default/default.services.*
 
 # Ignore paths that contain user-generated content.
 sites/*/files

PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,5 @@
 Fixes issue(s) # .
 
-[![CircleCI](https://circleci.com/gh/18F/nsf-sbir/tree/BRANCH_NAME.svg?style=svg)](https://circleci.com/gh/18F/nsf-sbir/tree/BRANCH_NAME)
-
-[:sunglasses: PREVIEW](https://federalist.fr.cloud.gov/preview/18f/nsf-sbir/BRANCH_NAME/)
-
-[Preview README for this branch](https://github.com/18F/nsf-sbir/blob/BRANCH_NAME/README.md)
-
 Changes proposed in this pull request:
 -
 -