Commit 96ecee3c authored by Benji Fisher's avatar Benji Fisher

Merge branch '16-upgrade-lando-config-file-for-rc2' into 'master'

Resolve "Upgrade Lando config file for RC2+"

Closes #16

See merge request !9
parents 23ad7598 de28e8c8
......@@ -10,36 +10,38 @@ config:
proxy:
nodejs:
- gatsby.lgd.lndo.site:8000
nginx:
appserver_nginx:
- drupal.lgd.lndo.site
gatsbydrupal:
- gatsbydrupal.lgd.lndo.site
services:
appserver:
install_dependencies_as_me:
build:
- cd drupal && composer install
run:
- echo "Clearing out user files from the Drupal site."
- rm -rf /app/drupal/web/sites/default/files
- cd drupal/web && drush --yes site:install demo_umami --db-url=mysql://drupal8:drupal8@database:3306/drupal8 --account-pass=admin --site-name='Drupal-Gatsby'
- cd drupal/web && drush --yes pm:enable jsonapi
- cd drupal/web && drush --yes pm:uninstall contact
nodejs:
type: node:8.9
type: node
ssl: true
overrides:
services:
ports: [8000:8000]
globals:
gatsby-cli: "latest"
yarn: "1.13.0"
run:
- echo "Installing Gatsby with yarn."
- cd gatsby && yarn install
gatsbydrupal:
appserver_nginx:
type: nginx
ssl: true
webroot: gatsby/public
build_as_root:
- cp /app/conf/nginx/drupal.lgd.lndo.site.conf /opt/bitnami/nginx/conf/vhosts/.
- cp /app/conf/nginx/gatsbydrupal.lgd.lndo.site.conf /opt/bitnami/nginx/conf/vhosts/.
events:
post-start:
- nodejs: echo "Building the Gatsby site from Drupal."
- nodejs: cd gatsby && gatsby build
tooling:
......
......@@ -123,7 +123,6 @@ Either way, you should be able to view your site at any of these URLS:
- https://gatsby.lgd.lndo.site/ (security warning from browser)
- http://gatsby.lgd.lndo.site/
- http://gatsby.lgd.lndo.site:8000/
- http://gatsby.lgd.lndo.site/blog/ (a list of articles imported from Drupal)
- [http://gatsby.lgd.lndo.site/\_\_\_graphql](http://gatsby.lgd.lndo.site/___graphql)
(The GraphiQL browser)
......
server {
listen 80 default_server;
listen 443 ssl;
server_name drupal.lgd.lndo.site;
ssl_certificate /certs/cert.crt;
ssl_certificate_key /certs/cert.key;
ssl_verify_client off;
ssl_session_cache shared:SSL:1m;
ssl_session_timeout 5m;
ssl_ciphers HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
port_in_redirect off;
client_max_body_size 100M;
root "/app/drupal/web";
location = /favicon.ico {
log_not_found off;
access_log off;
}
location = /robots.txt {
allow all;
log_not_found off;
access_log off;
}
# Very rarely should these ever be accessed outside of your lan
location ~* \.(txt|log)$ {
allow 192.168.0.0/16;
deny all;
}
location ~ \..*/.*\.php$ {
return 403;
}
location ~ ^/sites/.*/private/ {
return 403;
}
# Allow "Well-Known URIs" as per RFC 5785
location ~* ^/.well-known/ {
allow all;
}
# Block access to "hidden" files and directories whose names begin with a
# period. This includes directories used by version control systems such
# as Subversion or Git to store control files.
location ~ (^|/)\. {
return 403;
}
location / {
# try_files $uri @rewrite; # For Drupal <= 6
try_files $uri /index.php?$query_string; # For Drupal >= 7
}
location @rewrite {
rewrite ^/(.*)$ /index.php?q=$1;
}
# Don't allow direct access to PHP files in the vendor directory.
location ~ /vendor/.*\.php$ {
deny all;
return 404;
}
# In Drupal 8, we must also match new paths where the '.php' appears in
# the middle, such as update.php/selection. The rule we use is strict,
# and only allows this pattern with the update.php front controller.
# This allows legacy path aliases in the form of
# blog/index.php/legacy-path to continue to route to Drupal nodes. If
# you do not have any paths like that, then you might prefer to use a
# laxer rule, such as:
# location ~ \.php(/|$) {
# The laxer rule will continue to work if Drupal uses this new URL
# pattern with front controllers other than update.php in a future
# release.
location ~ '\.php$|^/update.php' {
fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
# Security note: If you're running a version of PHP older than the
# latest 5.3, you should have "cgi.fix_pathinfo = 0;" in php.ini.
# See http://serverfault.com/q/627903/94922 for details.
include fastcgi_params;
# Block httpoxy attacks. See https://httpoxy.org/.
fastcgi_param HTTP_PROXY "";
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param QUERY_STRING $query_string;
fastcgi_intercept_errors on;
# PHP 5 socket location.
#fastcgi_pass unix:/var/run/php5-fpm.sock;
# PHP 7 socket location.
#fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
#lando
fastcgi_pass fpm:9000;
}
# Fighting with Styles? This little gem is amazing.
# location ~ ^/sites/.*/files/imagecache/ { # For Drupal <= 6
location ~ ^(/[a-z\-]+)?/sites/.*/files/styles/ { # For Drupal >= 7
try_files $uri @rewrite;
}
# Handle private files through Drupal. Private file's path can come
# with a language prefix.
location ~ ^(/[a-z\-]+)?/system/files/ { # For Drupal >= 7
try_files $uri /index.php?$query_string;
}
location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
expires max;
log_not_found off;
}
}
server {
listen 443 ssl;
listen 80;
server_name gatsbydrupal.lgd.lndo.site;
ssl_certificate /certs/cert.crt;
ssl_certificate_key /certs/cert.key;
ssl_session_cache shared:SSL:1m;
ssl_session_timeout 5m;
ssl_ciphers HIGH:!aNULL:!MD5;
ssl_prefer_server_ciphers on;
location / {
root "/app/gatsby/public";
index index.html index.htm;
}
#error_page 404 /404.html;
# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root "/app/gatsby/public";
}
}
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment