Use sed to make .htaccess change, remove joomla.zip after update
This commit is contained in:
Michael Babker
parent
4c50e3a8e1
commit
dd1a637083
|
|
@ -27,7 +27,6 @@ RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/downloa
|
|||
|
||||
# Copy init scripts and custom .htaccess
|
||||
COPY docker-entrypoint.sh /entrypoint.sh
|
||||
COPY joomla-htaccess.txt /joomla-htaccess.txt
|
||||
COPY makedb.php /makedb.php
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then
|
|||
tar cf - --one-file-system -C /usr/src/joomla . | tar xf -
|
||||
|
||||
if [ ! -e .htaccess ]; then
|
||||
# NOTE: The "Indexes" option is disabled in the php:apache base image so we use a customized .htaccess
|
||||
cp /joomla-htaccess.txt .htaccess
|
||||
# NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess
|
||||
sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt > .htaccess
|
||||
chown www-data:www-data .htaccess
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
##
|
||||
# @package Joomla
|
||||
# @copyright Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
|
||||
# @license GNU General Public License version 2 or later; see LICENSE.txt
|
||||
##
|
||||
|
||||
##
|
||||
# READ THIS COMPLETELY IF YOU CHOOSE TO USE THIS FILE!
|
||||
#
|
||||
# The line just below this section: 'Options +FollowSymLinks' may cause problems
|
||||
# with some server configurations. It is required for use of mod_rewrite, but may already
|
||||
# be set by your server administrator in a way that disallows changing it in
|
||||
# your .htaccess file. If using it causes your server to error out, comment it out (add # to
|
||||
# beginning of line), reload your site in your browser and test your sef url's. If they work,
|
||||
# it has been set by your server administrator and you do not need it set here.
|
||||
##
|
||||
|
||||
## No directory listings
|
||||
IndexIgnore *
|
||||
|
||||
## Can be commented out if causes errors, see notes above.
|
||||
Options +FollowSymlinks
|
||||
# Options -Indexes
|
||||
|
||||
## Mod_rewrite in use.
|
||||
|
||||
RewriteEngine On
|
||||
|
||||
## Begin - Rewrite rules to block out some common exploits.
|
||||
# If you experience problems on your site block out the operations listed below
|
||||
# This attempts to block the most common type of exploit `attempts` to Joomla!
|
||||
#
|
||||
# Block out any script trying to base64_encode data within the URL.
|
||||
RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
|
||||
# Block out any script that includes a <script> tag in URL.
|
||||
RewriteCond %{QUERY_STRING} (<|%3C)([^s]*s)+cript.*(>|%3E) [NC,OR]
|
||||
# Block out any script trying to set a PHP GLOBALS variable via URL.
|
||||
RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
|
||||
# Block out any script trying to modify a _REQUEST variable via URL.
|
||||
RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
|
||||
# Return 403 Forbidden header and show the content of the root homepage
|
||||
RewriteRule .* index.php [F]
|
||||
#
|
||||
## End - Rewrite rules to block out some common exploits.
|
||||
|
||||
## Begin - Custom redirects
|
||||
#
|
||||
# If you need to redirect some pages, or set a canonical non-www to
|
||||
# www redirect (or vice versa), place that code here. Ensure those
|
||||
# redirects use the correct RewriteRule syntax and the [R=301,L] flags.
|
||||
#
|
||||
## End - Custom redirects
|
||||
|
||||
##
|
||||
# Uncomment following line if your webserver's URL
|
||||
# is not directly related to physical file paths.
|
||||
# Update Your Joomla! Directory (just / for root).
|
||||
##
|
||||
|
||||
# RewriteBase /
|
||||
|
||||
## Begin - Joomla! core SEF Section.
|
||||
#
|
||||
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
|
||||
#
|
||||
# If the requested path and file is not /index.php and the request
|
||||
# has not already been internally rewritten to the index.php script
|
||||
RewriteCond %{REQUEST_URI} !^/index\.php
|
||||
# and the requested path and file doesn't directly match a physical file
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
# and the requested path and file doesn't directly match a physical folder
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
# internally rewrite the request to the index.php script
|
||||
RewriteRule .* index.php [L]
|
||||
#
|
||||
## End - Joomla! core SEF Section.
|
||||
|
|
@ -45,8 +45,8 @@ if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then
|
|||
tar cf - --one-file-system -C /usr/src/joomla . | tar xf -
|
||||
|
||||
if [ ! -e .htaccess ]; then
|
||||
# NOTE: The "Indexes" option is disabled in the php:apache base image so we use a customized .htaccess
|
||||
cp /joomla-htaccess.txt .htaccess
|
||||
# NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess
|
||||
sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt > .htaccess
|
||||
chown www-data:www-data .htaccess
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/downloa
|
|||
|
||||
# Copy init scripts and custom .htaccess
|
||||
COPY docker-entrypoint.sh /entrypoint.sh
|
||||
COPY joomla-htaccess.txt /joomla-htaccess.txt
|
||||
COPY makedb.php /makedb.php
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then
|
|||
tar cf - --one-file-system -C /usr/src/joomla . | tar xf -
|
||||
|
||||
if [ ! -e .htaccess ]; then
|
||||
# NOTE: The "Indexes" option is disabled in the php:apache base image so we use a customized .htaccess
|
||||
cp /joomla-htaccess.txt .htaccess
|
||||
# NOTE: The "Indexes" option is disabled in the php:apache base image so remove it as we enable .htaccess
|
||||
sed -r 's/^(Options -Indexes.*)$/#\1/' htaccess.txt > .htaccess
|
||||
chown www-data:www-data .htaccess
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,76 +0,0 @@
|
|||
##
|
||||
# @package Joomla
|
||||
# @copyright Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
|
||||
# @license GNU General Public License version 2 or later; see LICENSE.txt
|
||||
##
|
||||
|
||||
##
|
||||
# READ THIS COMPLETELY IF YOU CHOOSE TO USE THIS FILE!
|
||||
#
|
||||
# The line just below this section: 'Options +FollowSymLinks' may cause problems
|
||||
# with some server configurations. It is required for use of mod_rewrite, but may already
|
||||
# be set by your server administrator in a way that disallows changing it in
|
||||
# your .htaccess file. If using it causes your server to error out, comment it out (add # to
|
||||
# beginning of line), reload your site in your browser and test your sef url's. If they work,
|
||||
# it has been set by your server administrator and you do not need it set here.
|
||||
##
|
||||
|
||||
## No directory listings
|
||||
IndexIgnore *
|
||||
|
||||
## Can be commented out if causes errors, see notes above.
|
||||
Options +FollowSymlinks
|
||||
# Options -Indexes
|
||||
|
||||
## Mod_rewrite in use.
|
||||
|
||||
RewriteEngine On
|
||||
|
||||
## Begin - Rewrite rules to block out some common exploits.
|
||||
# If you experience problems on your site block out the operations listed below
|
||||
# This attempts to block the most common type of exploit `attempts` to Joomla!
|
||||
#
|
||||
# Block out any script trying to base64_encode data within the URL.
|
||||
RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
|
||||
# Block out any script that includes a <script> tag in URL.
|
||||
RewriteCond %{QUERY_STRING} (<|%3C)([^s]*s)+cript.*(>|%3E) [NC,OR]
|
||||
# Block out any script trying to set a PHP GLOBALS variable via URL.
|
||||
RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
|
||||
# Block out any script trying to modify a _REQUEST variable via URL.
|
||||
RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
|
||||
# Return 403 Forbidden header and show the content of the root homepage
|
||||
RewriteRule .* index.php [F]
|
||||
#
|
||||
## End - Rewrite rules to block out some common exploits.
|
||||
|
||||
## Begin - Custom redirects
|
||||
#
|
||||
# If you need to redirect some pages, or set a canonical non-www to
|
||||
# www redirect (or vice versa), place that code here. Ensure those
|
||||
# redirects use the correct RewriteRule syntax and the [R=301,L] flags.
|
||||
#
|
||||
## End - Custom redirects
|
||||
|
||||
##
|
||||
# Uncomment following line if your webserver's URL
|
||||
# is not directly related to physical file paths.
|
||||
# Update Your Joomla! Directory (just / for root).
|
||||
##
|
||||
|
||||
# RewriteBase /
|
||||
|
||||
## Begin - Joomla! core SEF Section.
|
||||
#
|
||||
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
|
||||
#
|
||||
# If the requested path and file is not /index.php and the request
|
||||
# has not already been internally rewritten to the index.php script
|
||||
RewriteCond %{REQUEST_URI} !^/index\.php
|
||||
# and the requested path and file doesn't directly match a physical file
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
# and the requested path and file doesn't directly match a physical folder
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
# internally rewrite the request to the index.php script
|
||||
RewriteRule .* index.php [L]
|
||||
#
|
||||
## End - Joomla! core SEF Section.
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
##
|
||||
# @package Joomla
|
||||
# @copyright Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
|
||||
# @license GNU General Public License version 2 or later; see LICENSE.txt
|
||||
##
|
||||
|
||||
##
|
||||
# READ THIS COMPLETELY IF YOU CHOOSE TO USE THIS FILE!
|
||||
#
|
||||
# The line just below this section: 'Options +FollowSymLinks' may cause problems
|
||||
# with some server configurations. It is required for use of mod_rewrite, but may already
|
||||
# be set by your server administrator in a way that disallows changing it in
|
||||
# your .htaccess file. If using it causes your server to error out, comment it out (add # to
|
||||
# beginning of line), reload your site in your browser and test your sef url's. If they work,
|
||||
# it has been set by your server administrator and you do not need it set here.
|
||||
##
|
||||
|
||||
## No directory listings
|
||||
IndexIgnore *
|
||||
|
||||
## Can be commented out if causes errors, see notes above.
|
||||
Options +FollowSymlinks
|
||||
# Options -Indexes
|
||||
|
||||
## Mod_rewrite in use.
|
||||
|
||||
RewriteEngine On
|
||||
|
||||
## Begin - Rewrite rules to block out some common exploits.
|
||||
# If you experience problems on your site block out the operations listed below
|
||||
# This attempts to block the most common type of exploit `attempts` to Joomla!
|
||||
#
|
||||
# Block out any script trying to base64_encode data within the URL.
|
||||
RewriteCond %{QUERY_STRING} base64_encode[^(]*\([^)]*\) [OR]
|
||||
# Block out any script that includes a <script> tag in URL.
|
||||
RewriteCond %{QUERY_STRING} (<|%3C)([^s]*s)+cript.*(>|%3E) [NC,OR]
|
||||
# Block out any script trying to set a PHP GLOBALS variable via URL.
|
||||
RewriteCond %{QUERY_STRING} GLOBALS(=|\[|\%[0-9A-Z]{0,2}) [OR]
|
||||
# Block out any script trying to modify a _REQUEST variable via URL.
|
||||
RewriteCond %{QUERY_STRING} _REQUEST(=|\[|\%[0-9A-Z]{0,2})
|
||||
# Return 403 Forbidden header and show the content of the root homepage
|
||||
RewriteRule .* index.php [F]
|
||||
#
|
||||
## End - Rewrite rules to block out some common exploits.
|
||||
|
||||
## Begin - Custom redirects
|
||||
#
|
||||
# If you need to redirect some pages, or set a canonical non-www to
|
||||
# www redirect (or vice versa), place that code here. Ensure those
|
||||
# redirects use the correct RewriteRule syntax and the [R=301,L] flags.
|
||||
#
|
||||
## End - Custom redirects
|
||||
|
||||
##
|
||||
# Uncomment following line if your webserver's URL
|
||||
# is not directly related to physical file paths.
|
||||
# Update Your Joomla! Directory (just / for root).
|
||||
##
|
||||
|
||||
# RewriteBase /
|
||||
|
||||
## Begin - Joomla! core SEF Section.
|
||||
#
|
||||
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
|
||||
#
|
||||
# If the requested path and file is not /index.php and the request
|
||||
# has not already been internally rewritten to the index.php script
|
||||
RewriteCond %{REQUEST_URI} !^/index\.php
|
||||
# and the requested path and file doesn't directly match a physical file
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
# and the requested path and file doesn't directly match a physical folder
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
# internally rewrite the request to the index.php script
|
||||
RewriteRule .* index.php [L]
|
||||
#
|
||||
## End - Joomla! core SEF Section.
|
||||
|
|
@ -26,7 +26,8 @@ for variant in apache fpm; do
|
|||
|
||||
# To make management easier, we use these files for all variants
|
||||
cp docker-entrypoint.sh "$variant/docker-entrypoint.sh"
|
||||
cp joomla-htaccess.txt "$variant/joomla-htaccess.txt"
|
||||
cp makedb.php "$variant/makedb.php"
|
||||
)
|
||||
done
|
||||
|
||||
rm joomla.zip
|
||||
|
|
|
|||
Loading…
Reference in New Issue