LAB-linuxserver/docker-dokuwiki
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-dokuwiki.git synced 2026-02-20 00:58:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from linuxserver/grep

Browse Source 
fix php-local.ini bug introduced in last PR
This commit is contained in:
j0nnymoe 2020-09-28 13:06:53 +01:00 committed by GitHub
commit f657115da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -218,6 +218,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **23.09.20:** - Fix php-local.ini bug introduced in the prior PR.
* **14.09.20:** - Rebase to alpine 3.12. Add php7-ctype, php7-curl, php7-pdo_mysql, php7-pdo_pgsql, php7-pecl-imagick and php7-iconv. Bump upload max filesize and post max size to 100MB. Remove deprecated APP_URL env var. Fix breaking addons.
* **19.12.19:** - Rebasing to alpine 3.11.
* **01.12.19:** - Add php7-ldap package to support LDAP authentication.

1
readme-vars.yml
View File

@ -40,6 +40,7 @@ app_setup_block: |
Upon first install go to `http://$IP:$PORT/install.php` once you have completed the setup, restart the container, login as admin and set "Use nice URLs" in the `admin/Configuration Settings` panel to `.htaccess` and tick `Use slash as namespace separator in URLs` to enable [nice URLs](https://www.dokuwiki.org/rewrite) you will find the webui at `http://$IP:$PORT/`, for more info see [{{ project_name|capitalize }}]({{ project_url }})
# changelog
changelogs:
- { date: "23.09.20:", desc: "Fix php-local.ini bug introduced in the prior PR." }
- { date: "14.09.20:", desc: "Rebase to alpine 3.12. Add php7-ctype, php7-curl, php7-pdo_mysql, php7-pdo_pgsql, php7-pecl-imagick and php7-iconv. Bump upload max filesize and post max size to 100MB. Remove deprecated APP_URL env var. Fix breaking addons."}
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
- { date: "01.12.19:", desc: "Add php7-ldap package to support LDAP authentication." }

9
root/etc/cont-init.d/50-config
View File

@ -51,9 +51,14 @@ for i in "${CORE_DIR[@]}"; do
ln -s /app/dokuwiki/"${i}" /config/dokuwiki/"${i}"
done
## TODO: Remove this following bit by 12/19/2020
# Remove erronously added configs post-init
sed -i "s/^upload_max_filesize = 100MB$//g" /config/php/php-local.ini
sed -i "s/^post_max_size = 100MB$//g" /config/php/php-local.ini
## Bump php upload max filesize and post max size to 100MB by default
grep -qF 'upload_max_filesize' /config/php/php-local.ini || echo 'upload_max_filesize = 100MB' >> /config/php/php-local.ini
grep -qF 'post_max_size' /config/php/php-local.ini || echo 'post_max_size = 100MB' >> /config/php/php-local.ini
grep -qF 'upload_max_filesize' /config/php/php-local.ini || echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini
grep -qF 'post_max_size' /config/php/php-local.ini || echo 'post_max_size = 100M' >> /config/php/php-local.ini
## Remove install.php once setup & enable pretty urls to work after setting .htaccess method in admin panel.
if [[ -f /config/dokuwiki/conf/local.php ]]; then