adphi/Nextcloud-Docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #152 from nextcloud/apache-pretty-urls

Browse Source 
Pretty URLs for apache
This commit is contained in:
Tilo Spannagel 2017-09-14 13:58:23 +02:00 committed by GitHub
commit 0d38b64c07
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.config/apache-pretty-urls.config.php Normal file
View File

@ -0,0 +1,4 @@
<?php
$CONFIG = array (
'htaccess.RewriteBase' => '/',
);

4
11.0/apache/config/apache-pretty-urls.config.php Normal file
View File

@ -0,0 +1,4 @@
<?php
$CONFIG = array (
'htaccess.RewriteBase' => '/',
);

4
12.0/apache/config/apache-pretty-urls.config.php Normal file
View File

@ -0,0 +1,4 @@
<?php
$CONFIG = array (
'htaccess.RewriteBase' => '/',
);

11
update.sh
View File

@ -45,17 +45,18 @@ for latest in "${latests[@]}"; do
s/%%CMD%%/'"${cmd[$variant]}"'/g; s/%%CMD%%/'"${cmd[$variant]}"'/g;
' "$version/$variant/Dockerfile" ' "$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. # Copy the docker-entrypoint.
cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh" cp docker-entrypoint.sh "$version/$variant/docker-entrypoint.sh"
# Copy the config directory # Copy the config directory
cp -rT .config "$version/$variant/config" 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 for arch in i386 amd64; do
travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv" travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
done done