From fd0cc806c8fe779c3f26fc41b0386f1d4ca9a2af Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Thu, 14 Sep 2017 10:23:46 +0200
Subject: [PATCH] Pretty URLs for apache
---
.config/apache-pretty-urls.config.php | 4 ++++
11.0/apache/config/apache-pretty-urls.config.php | 4 ++++
12.0/apache/config/apache-pretty-urls.config.php | 4 ++++
update.sh | 11 ++++++-----
4 files changed, 18 insertions(+), 5 deletions(-)
create mode 100644 .config/apache-pretty-urls.config.php
create mode 100644 11.0/apache/config/apache-pretty-urls.config.php
create mode 100644 12.0/apache/config/apache-pretty-urls.config.php
diff --git a/.config/apache-pretty-urls.config.php b/.config/apache-pretty-urls.config.php
new file mode 100644
index 00000000..72da1d8c
--- /dev/null
+++ b/.config/apache-pretty-urls.config.php
@@ -0,0 +1,4 @@
+<?php
+$CONFIG = array (
+ 'htaccess.RewriteBase' => '/',
+);
diff --git a/11.0/apache/config/apache-pretty-urls.config.php b/11.0/apache/config/apache-pretty-urls.config.php
new file mode 100644
index 00000000..72da1d8c
--- /dev/null
+++ b/11.0/apache/config/apache-pretty-urls.config.php
@@ -0,0 +1,4 @@
+<?php
+$CONFIG = array (
+ 'htaccess.RewriteBase' => '/',
+);
diff --git a/12.0/apache/config/apache-pretty-urls.config.php b/12.0/apache/config/apache-pretty-urls.config.php
new file mode 100644
index 00000000..72da1d8c
--- /dev/null
+++ b/12.0/apache/config/apache-pretty-urls.config.php
@@ -0,0 +1,4 @@
+<?php
+$CONFIG = array (
+ 'htaccess.RewriteBase' => '/',
+);
diff --git a/update.sh b/update.sh
index ad6efc48..6ed577f1 100755
--- a/update.sh
+++ b/update.sh
@@ -45,17 +45,18 @@ for latest in "${latests[@]}"; do
s/%%CMD%%/'"${cmd[$variant]}"'/g;
' "$version/$variant/Dockerfile"
- # Remove Apache commands if we're not an Apache variant.
- if [ "$variant" != "apache" ]; then
- sed -ri -e '/a2enmod/d' "$version/$variant/Dockerfile"
- fi
-
# Copy the docker-entrypoint.
cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh"
# Copy the config directory
cp -rT .config "$version/$variant/config"
+ # Remove Apache commands and configs if we're not an Apache variant.
+ if [ "$variant" != "apache" ]; then
+ sed -ri -e '/a2enmod/d' "$version/$variant/Dockerfile"
+ rm "$version/$variant/config/apache-pretty-urls.config.php"
+ fi
+
for arch in i386 amd64; do
travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
done
--
GitLab