diff options
author | Tilo Spannagel <development@tilosp.de> | 2017-09-14 13:58:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-14 13:58:23 +0200 |
commit | 0d38b64c07cd5ecc1f12873299b92a438fd2daa5 (patch) | |
tree | 4e2145034555f677fab5f45ffce56648d80e94e3 | |
parent | 748af1e7b480f903ade42c79235b2a47a1d90582 (diff) | |
parent | fd0cc806c8fe779c3f26fc41b0386f1d4ca9a2af (diff) |
Merge pull request #152 from nextcloud/apache-pretty-urls
Pretty URLs for apache
-rw-r--r-- | .config/apache-pretty-urls.config.php | 4 | ||||
-rw-r--r-- | 11.0/apache/config/apache-pretty-urls.config.php | 4 | ||||
-rw-r--r-- | 12.0/apache/config/apache-pretty-urls.config.php | 4 | ||||
-rwxr-xr-x | update.sh | 11 |
4 files changed, 18 insertions, 5 deletions
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' => '/', +); @@ -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 |