Differences

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

--- servers:linux:nginx:dokuwiki [2025/12/20 02:31] – Sean Rhone
+++ servers:linux:nginx:dokuwiki [2025/12/20 23:33] (current) – old revision restored (2025/12/20 19:44) Sean Rhone
@@ Line 10: / Line 10: @@
   * [[servers:linux:nginx_php_php-fpm|nginx + PHP + PHP-FPM]]
   * [[servers:linux:nginx:lets_encrypt|Certbot (Let's Encrypt)]]
-====== TODOs ======
-  * https://www.dokuwiki.org/cli?s%5B%5D=wantedpages.php
 ====== Dependencies ======
@@ Line 53: / Line 49: @@
 pm.process_idle_timeout = "30"
-; General
+; Logging
 php_value[log_errors] = "0"
 php_value[error_reporting] = "~E_ALL"
+; General
 php_value[date.timezone] = "America/New_York"
@@ Line 134: / Line 132: @@
 ====== Initial Setup ======
-  * TODO: https://www.dokuwiki.org/rewrite ((notes; rewrite's been working fine though))
   * https://wiki.realmofespionage.xyz/install.php
@@ Line 169: / Line 165: @@
   echo '--      --' | sudo -u 'www-data' tee '/var/www/wiki/conf/entities.local.conf' > '/dev/null'
+====== Scripts ======
+===== Git Fix =====
+  * :!: Set email for ''user.email''
+  sudo mkdir -p '/etc/nginx/scripts/wiki' && sudo -e '/etc/nginx/scripts/wiki/git-fix.sh' && sudo chmod '0500' '/etc/nginx/scripts/wiki/git-fix.sh' && sudo chown 'www-data':'www-data' '/etc/nginx/scripts/wiki/git-fix.sh'
+<code>
+#!/bin/bash
+'/usr/bin/rm' -Rf '/var/www/wiki/.git'
+'/usr/bin/git' -C '/var/www/wiki' init --initial-branch='master'
+'/usr/bin/git' -C '/var/www/wiki' add '.'
+########################################
+'/usr/bin/git' -C '/var/www/wiki' config 'user.email' 'espionage724@x'
+########################################
+'/usr/bin/git' -C '/var/www/wiki' commit --message='x'
+'/usr/bin/git' -C '/var/www/wiki' remote add 'origin' 'https://github.com/dokuwiki/dokuwiki.git'
+'/usr/bin/git' -C '/var/www/wiki' pull --depth '1' --recurse-submodules 'origin' 'master' --rebase
+'/usr/bin/git' -C '/var/www/wiki' reset --hard 'origin/master'
+'/usr/bin/git' -C '/var/www/wiki' gc --aggressive --prune='all'
+'/usr/bin/git' -C '/var/www/wiki' fsck --full --strict
+# End</code>
+  sudo -u 'www-data' '/etc/nginx/scripts/wiki/git-fix.sh'
 ====== Services ======
@@ Line 184: / Line 212: @@
 Type=oneshot
-ExecStart='/usr/bin/git' -C '/var/www/wiki' pull origin 'master'
+WorkingDirectory=/var/www/wiki
+ExecStart='/usr/bin/git' -C '/var/www/wiki' reset --hard
+ExecStart='/usr/bin/git' -C '/var/www/wiki' pull origin 'master' --rebase
+ExecStart='/usr/bin/php' '/var/www/wiki/bin/indexer.php' --clear
+ExecStart='/usr/bin/touch' '/var/www/wiki/conf/local.php'
-ExecStartPost='/usr/bin/touch' '/var/www/wiki/conf/local.php'
 ExecStartPost='/usr/bin/sync'
@@ Line 193: / Line 226: @@
 ==== Timer ====
-  * Every day at ''00:00:00''
+  * Daily ''12:00:00 AM''
   sudo -e '/etc/systemd/system/wiki-up.timer' && sudo systemctl daemon-reload && sudo systemctl enable 'wiki-up.timer' --now && sudo systemctl start 'wiki-up' && sudo systemctl status 'wiki-up' -l
@@ Line 213: / Line 246: @@
 ===== Backup =====
+  * TODO: NAS mount
 ==== Service ====
@@ Line 221: / Line 256: @@
 [Service]
 Type=oneshot
+WorkingDirectory=/var/www/wiki
 ExecStart='/usr/bin/bash' -c '"/usr/bin/tar" -czf "/home/CHANGEME/backups/dokuwiki-files-auto-"$$(date +%%Y-%%m-%%d)".tar.gz" -C "/var/www/wiki" "data/pages" "data/meta" "data/media" "data/media_meta" "data/attic" "data/media_attic" "conf"'
@@ Line 230: / Line 267: @@
 ==== Timer ====
-  * Every day at ''00:15:00''
+  * Weekly (Monday) ''12:15:00 AM''
   sudo -e '/etc/systemd/system/wiki-fb.timer' && sudo systemctl daemon-reload && sudo systemctl enable 'wiki-fb.timer' --now && sudo systemctl start 'wiki-fb' && sudo systemctl status 'wiki-fb' -l
@@ Line 239: / Line 276: @@
 [Timer]
-OnCalendar=*-*-* 00:15:00
+OnCalendar=Mon *-*-* 00:15:00
 Persistent=true
@@ Line 256: / Line 293: @@
 [Service]
 User=www-data
-Group=www
+Group=www-data
 Type=oneshot
-ExecStart='/usr/bin/git' -C '/var/www/wiki' reset --hard
+WorkingDirectory=/var/www/wiki
 ExecStart='/usr/bin/git' -C '/var/www/wiki' gc --aggressive --prune='all'
 ExecStart='/usr/bin/git' -C '/var/www/wiki' fsck --full --strict
-ExecStart='/usr/bin/bash' -c "find '/var/www/wiki/data'/{attic,cache,index,locks,media,media_attic,media_meta,meta,pages,tmp}/ -mindepth '1' -type 'd' -empty -delete"
-ExecStart='/usr/bin/php' '/var/www/wiki/bin/indexer.php' --clear
 ExecStartPost='/usr/bin/sync'
@@ Line 272: / Line 307: @@
 ==== Timer ====
-  * ''01'' day of every month at ''00:30:00''
+  * Monthly (1st) ''12:30:00 AM''
   sudo -e '/etc/systemd/system/wiki-m.timer' && sudo systemctl daemon-reload && sudo systemctl enable 'wiki-m.timer' --now
@@ Line 370: / Line 405: @@
   rm -fv ~/'dokuwiki-files-'*'.tar.gz'
+====== TODOs ======
+  * https://www.dokuwiki.org/cli?s%5B%5D=wantedpages.php
+  * https://www.dokuwiki.org/rewrite