Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})

* Enabled `mod_expires` Apache module by default [lando/lando#976](https://github.com/lando/lando/issues/976)
* Fixed unclosed `<IfModule>` tag in `httpd.conf`
* Updated `@lando/argv` to `1.2.0`
* Updated `lodash` to `4.17.23`
* Updated `lodash-es` to `4.17.23`
Expand Down
3 changes: 2 additions & 1 deletion config/httpd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ LoadModule log_config_module modules/mod_log_config.so
#LoadModule log_debug_module modules/mod_log_debug.so
#LoadModule logio_module modules/mod_logio.so
LoadModule env_module modules/mod_env.so
#LoadModule expires_module modules/mod_expires.so
LoadModule expires_module modules/mod_expires.so
LoadModule headers_module modules/mod_headers.so
#LoadModule unique_id_module modules/mod_unique_id.so
LoadModule setenvif_module modules/mod_setenvif.so
Expand Down Expand Up @@ -518,3 +518,4 @@ IncludeOptional /opt/bitnami/apache/conf/vhosts/*.conf

<IfModule mod_headers.c>
RequestHeader unset Proxy
</IfModule>
8 changes: 8 additions & 0 deletions examples/2.4/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<IfModule mod_headers.c>
Header set X-Lando-Test "blazes"
</IfModule>

<IfModule mod_expires.c>
ExpiresActive On
ExpiresDefault "access plus 1 hour"
</IfModule>
6 changes: 6 additions & 0 deletions examples/2.4/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ lando exec curl -- curl http://defaults | grep ROOTDIR

# Should only serve over http by default
lando exec curl -- curl https://defaults || echo $? | grep 7

# Should have mod_headers enabled and working
lando exec curl -- curl -sI http://defaults | grep -i "X-Lando-Test: blazes"

# Should have mod_expires enabled and working
lando exec curl -- curl -sI http://defaults | grep -i "Expires:"
```

## Destroy tests
Expand Down
Loading