Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove unecessary d6/d7 image preset rules #147

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

remove unecessary d6/d7 image preset rules #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e434a7
remove d6 imagecache config from d7 version
Jan 6, 2014
21890f1
remove d7 image style config from d6 version
Jan 6, 2014
02d8153
Revert "remove d7 image style config from d6 version"
Jan 7, 2014
435bc0a
Revert "remove d6 imagecache config from d7 version"
Jan 7, 2014
0b5cebd
comment out d6 imagecache rules in d7 config & vice-versa and add bri…
Jan 7, 2014
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
21 changes: 12 additions & 9 deletions apps/drupal/drupal_boost.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,21 @@ location / {
log_not_found off;
}

## Drupal 6 imagecache handling. Uncomment the block below if your site
## has been migrated from Drupal 6 and/or you need to use the "imagecache"
## files directory.
## If accessing an image generated by Drupal 6 imagecache, serve it
## directly if available, if not relay the request to Drupal to (re)generate
## the image.
location ~* /imagecache/ {
## Image hotlinking protection. If you want hotlinking
## protection for your images uncomment the following line.
#include apps/drupal/hotlinking_protection.conf;

access_log off;
expires 30d;
try_files $uri @drupal;
}
#location ~* /imagecache/ {
# ## Image hotlinking protection. If you want hotlinking
# ## protection for your images uncomment the following line.
# #include apps/drupal/hotlinking_protection.conf;
#
# access_log off;
# expires 30d;
# try_files $uri @drupal;
#}

## Drupal 7 generated image handling, i.e., imagecache in core. See:
## http://drupal.org/node/371374.
Expand Down
13 changes: 8 additions & 5 deletions apps/drupal/drupal_boost6.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,16 @@ location / {
try_files $uri /index.php?q=$no_slash_uri&$args;
}

## Drupal 7 image style handling. Uncomment the block below if your site
## is being migrated to Drupal 7 and/or you need to use the "styles" files
## directory.
## Drupal 7 generated image handling, i.e., imagecache in core. See:
## http://drupal.org/node/371374.
location ~* /files/styles/ {
access_log off;
expires 30d;
try_files $uri /index.php?q=$no_slash_uri&$args;
}
#location ~* /files/styles/ {
# access_log off;
# expires 30d;
# try_files $uri /index.php?q=$no_slash_uri&$args;
#}

## Advanced Aggregation module CSS
## support. http://drupal.org/project/advagg.
Expand Down