Differences

This shows you the differences between two versions of the page.

--- servers:windows:nginx:dokuwiki [2025/11/16 03:13] – [Server Block] Sean Rhone
+++ servers:windows:nginx:dokuwiki [2025/11/29 02:28] (current) – [Back-up] Sean Rhone
@@ Line 39: / Line 39: @@
 extension = "openssl"
 extension = "sodium"
+error_reporting = "~E_ALL"
+display_errors = "Off"
+log_errors = "Off"
 [Date]
@@ Line 88: / Line 92: @@
  client_max_body_size "10M";
- add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data:" always;
+ add_header "Content-Security-Policy" "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data:" "always";
-# access_log  logs/wiki-access.log;
+# access_log "logs/wiki-access.log";
-# error_log  logs/wiki-error.log;
+# error_log "logs/wiki-error.log";
 # location = "/install.php" {
@@ Line 106: / Line 110: @@
  location "/" {
-  try_files "$uri" "$uri/ @dokuwiki";
+  try_files "$uri" "$uri/" "@dokuwiki";
  }
@@ Line 113: / Line 117: @@
   rewrite "^/_detail/(.*)" "/lib/exe/detail.php?media=$1" "last";
   rewrite "^/_export/([^/]+)/(.*)" "/doku.php?do=export_$1&id=$2" "last";
-  rewrite "^/(.*)" "/doku.php?id=$1&$args last";
+  rewrite "^/(.*)" "/doku.php?id=$1&$args" "last";
  }
@@ Line 138: / Line 142: @@
 SET "PHP_FCGI_CHILDREN=1"
-START "Wiki PHP-CGI" "php-cgi.exe" -b "127.0.0.1:9002" -c "%SystemDrive%\www\php\wiki.ini" -q
+START "Wiki PHP-CGI" /MIN "php-cgi.exe" -b "127.0.0.1:9002" -c "%SystemDrive%\www\php\wiki.ini" -q
 :: End</code>
@@ Line 151: / Line 155: @@
 @echo off
-"%ProgramFiles%\Git\bin\git.exe" -C "%SystemDrive%\www\wiki" pull origin "master"
+TITLE Wiki Updater
+"%ProgramFiles%\Git\bin\git.exe" -C "%SystemDrive%\www\wiki" reset --hard "origin/master"
+"%ProgramFiles%\Git\bin\git.exe" -C "%SystemDrive%\www\wiki" pull origin "master" --rebase
+"php.exe" "%SystemDrive%\www\wiki\bin\indexer.php" --clear
 :: End</code>
@@ Line 158: / Line 167: @@
 ===== Back-up =====
+  * ''D:\Servers\Scheduled Backups''
   "notepad.exe" "%SystemDrive%\www\scripts\wiki\Back-up.bat"
@@ Line 163: / Line 174: @@
 <code>
 @echo off
+TITLE Wiki Back-up
 :: User\Downloads
-"tar.exe" -czf "%UserProfile%\Downloads\dokuwiki-files-auto-%RANDOM%.tar.gz" -C "%SystemDrive%\www\wiki" "data/pages" "data/meta" "data/media" "data/media_meta" "data/attic" "data/media_attic" "conf"
+::"tar.exe" -czf "%UserProfile%\Downloads\dokuwiki-files-auto-%RANDOM%.tar.gz" -C "%SystemDrive%\www\wiki" "data/pages" "data/meta" "data/media" "data/media_meta" "data/attic" "data/media_attic" "conf"
 :: NAS
-::"tar.exe" -czf "D:\Servers\Scheduled Backups\dokuwiki-files-auto-%RANDOM%.tar.gz" -C "%SystemDrive%\www\wiki" "data/pages" "data/meta" "data/media" "data/media_meta" "data/attic" "data/media_attic" "conf"
+"tar.exe" -czf "D:\Servers\Scheduled Backups\dokuwiki-files-auto-%RANDOM%.tar.gz" -C "%SystemDrive%\www\wiki" "data/pages" "data/meta" "data/media" "data/media_meta" "data/attic" "data/media_attic" "conf"
 :: End</code>
@@ Line 181: / Line 194: @@
 @echo off
-"%ProgramFiles%\Git\bin\git.exe" -C "%SystemDrive%\www\wiki" reset --hard
+TITLE Wiki Maintenance
-"%ProgramFiles%\Git\bin\git.exe" -C "%SystemDrive%\www\wiki" gc --aggressive --prune="all"
+CALL "%SystemDrive%\www\scripts\wiki\Git Fix.bat"
-"%ProgramFiles%\Git\bin\git.exe" -C "%SystemDrive%\www\wiki" fsck --full --strict
-"php.exe" "%SystemDrive%\www\wiki\bin\indexer.php" --clear
 :: End</code>
@@ Line 200: / Line 210: @@
 <code>
 @echo off
+TITLE Wiki Git Fix
 RMDIR /S /Q "%SystemDrive%\www\wiki\.git"
@@ Line 214: / Line 226: @@
 "%ProgramFiles%\Git\bin\git.exe" -C "%SystemDrive%\www\wiki" gc --aggressive --prune="all"
 "%ProgramFiles%\Git\bin\git.exe" -C "%SystemDrive%\www\wiki" fsck --full --strict
-PAUSE
 :: End</code>
@@ Line 225: / Line 235: @@
 ===== Autostart =====
-==== CGI ====
+==== PHP-CGI ====
   "explorer.exe" "%AppData%\Microsoft\Windows\Start Menu\Programs\StartUp"