Skip to content

Commit 9737720

Browse files
committed
Cleanup default site conf
Signed-off-by: Eric Nemchik <eric@nemchik.com>
1 parent 5556151 commit 9737720

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ app_setup_block: |
3939
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 }})
4040
# changelog
4141
changelogs:
42+
- { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
4243
- { date: "21.07.23:", desc: "Update built-in plugins on container update." }
4344
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
4445
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }

root/defaults/nginx/site-confs/default.conf.sample

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-dokuwiki/commits/master/root/defaults/nginx/site-confs/default.conf.sample
1+
## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-dokuwiki/commits/master/root/defaults/nginx/site-confs/default.conf.sample
22

33
server {
44
listen 80 default_server;
@@ -40,7 +40,12 @@ server {
4040
}
4141

4242
location ~ ^(.+\.php)(.*)$ {
43+
# enable the next two lines for http auth
44+
#auth_basic "Restricted";
45+
#auth_basic_user_file /config/nginx/.htpasswd;
46+
4347
fastcgi_split_path_info ^(.+\.php)(.*)$;
48+
if (!-f $document_root$fastcgi_script_name) { return 404; }
4449
fastcgi_pass 127.0.0.1:9000;
4550
fastcgi_index index.php;
4651
include /etc/nginx/fastcgi_params;

0 commit comments

Comments
 (0)