Skip to content

Commit fd0cc80

Browse files
committed
Pretty URLs for apache
1 parent 748af1e commit fd0cc80

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

.config/apache-pretty-urls.config.php

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?php
2+
$CONFIG = array (
3+
'htaccess.RewriteBase' => '/',
4+
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?php
2+
$CONFIG = array (
3+
'htaccess.RewriteBase' => '/',
4+
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?php
2+
$CONFIG = array (
3+
'htaccess.RewriteBase' => '/',
4+
);

update.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,18 @@ for latest in "${latests[@]}"; do
4545
s/%%CMD%%/'"${cmd[$variant]}"'/g;
4646
' "$version/$variant/Dockerfile"
4747

48-
# Remove Apache commands if we're not an Apache variant.
49-
if [ "$variant" != "apache" ]; then
50-
sed -ri -e '/a2enmod/d' "$version/$variant/Dockerfile"
51-
fi
52-
5348
# Copy the docker-entrypoint.
5449
cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh"
5550

5651
# Copy the config directory
5752
cp -rT .config "$version/$variant/config"
5853

54+
# Remove Apache commands and configs if we're not an Apache variant.
55+
if [ "$variant" != "apache" ]; then
56+
sed -ri -e '/a2enmod/d' "$version/$variant/Dockerfile"
57+
rm "$version/$variant/config/apache-pretty-urls.config.php"
58+
fi
59+
5960
for arch in i386 amd64; do
6061
travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
6162
done

0 commit comments

Comments
 (0)