Permalink
Browse files

Add patches directory

  • Loading branch information...
viljaste committed Oct 9, 2017
1 parent b7af3ea commit 9e133e7892ecd8513f601bc295db028cbb9e07d0
Showing with 59 additions and 0 deletions.
  1. +7 −0 README.md
  2. +30 −0 patches/change_docroot_from_www_web_to_www_drupal.patch
  3. +22 −0 patches/switch_to_php_5_6.patch
View
@@ -166,6 +166,13 @@ will start your project services for you.
$ my-project/bin/start-services.sh
```
## Patches
Sometimes you need an extra bit of functionality that Drupalstack doesn't
provide by default. If you find that your changes to your stack are somewhat
universal and someone else might benefit from it as well then just create a
patch from your changes and it to the `patches` directory.
## What is `.env` file used for?
The `.env` file is used to store environment specific configuration to control
@@ -0,0 +1,30 @@
Index: services/httpd/src/usr/local/apache2/conf/extra/httpd-php.conf
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- services/httpd/src/usr/local/apache2/conf/extra/httpd-php.conf (revision 4cfb6c1ece7e4bdc7ad81a800e6f6d23f6d9c99c)
+++ services/httpd/src/usr/local/apache2/conf/extra/httpd-php.conf (revision )
@@ -1,3 +1,3 @@
SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
-ProxyPassMatch "^/(.*\.php(/.*)?)$" "fcgi://php:9000/usr/local/apache2/htdocs/web/" timeout=600
+ProxyPassMatch "^/(.*\.php(/.*)?)$" "fcgi://php:9000/usr/local/apache2/htdocs/drupal/" timeout=600
Index: services/httpd/src/usr/local/apache2/conf/httpd.conf
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- services/httpd/src/usr/local/apache2/conf/httpd.conf (revision 4cfb6c1ece7e4bdc7ad81a800e6f6d23f6d9c99c)
+++ services/httpd/src/usr/local/apache2/conf/httpd.conf (revision )
@@ -255,8 +255,8 @@
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
#
-DocumentRoot "/usr/local/apache2/htdocs/web"
-<Directory "/usr/local/apache2/htdocs/web">
+DocumentRoot "/usr/local/apache2/htdocs/drupal"
+<Directory "/usr/local/apache2/htdocs/drupal">
#
# Possible values for the Options directive are "None", "All",
# or any combination of:
@@ -0,0 +1,22 @@
Index: services/php/Dockerfile
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- services/php/Dockerfile (revision 68d214a81e985013c669a40d72ad2bb46a1e66aa)
+++ services/php/Dockerfile (revision )
@@ -1,4 +1,4 @@
-FROM php:7.1-fpm
+FROM php:5.6-fpm
RUN echo "Europe/Tallinn" > /etc/timezone \
&& dpkg-reconfigure -f noninteractive tzdata
@@ -115,7 +115,7 @@
RUN pecl install xdebug-2.5.5 \
&& docker-php-ext-enable xdebug
-RUN pecl install memcached-3.0.3 \
+RUN pecl install memcached-2.2.0 \
&& docker-php-ext-enable memcached
RUN pecl install redis-3.1.3 \

0 comments on commit 9e133e7

Please sign in to comment.