Skip to content

fix php-local.ini bug introduced in last PR #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
j0nnymoe merged 1 commit into from
Sep 28, 2020
Merged

fix php-local.ini bug introduced in last PR #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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." }
Expand Down
9 changes: 7 additions & 2 deletions root/etc/cont-init.d/50-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down