Differences

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

--- servers:nginx:dokuwiki [2023/08/31 08:21] – [Dependencies] Sean Rhone
+++ servers:nginx:dokuwiki [2024/02/07 16:37] (current) – [Server Block] Sean Rhone
@@ Line 7: / Line 7: @@
 ===== Prerequisites =====
-  * [[distros:opensuse_tumbleweed_server|openSUSE Tumbleweed]]
+  * [[distros:fedora_server|Fedora Server]]
   * [[servers:nginx_php_php-fpm|nginx + PHP + PHP-FPM]]
   * [[servers:nginx:lets_encrypt|Let's Encrypt]]
@@ Line 13: / Line 13: @@
 ====== Dependencies ======
-****
+  * PHP Modules: gd sodium zip zlib xml
-  sudo zypper install php8-gd php8-sodium php8-zip php8-zlib
+  sudo dnf install php-gd php-sodium php-pecl-zip php-xml
 ====== Download Source ======
@@ Line 21: / Line 21: @@
 ****
-  sudo git clone --branch 'master' --depth '1' --recurse-submodules 'https://github.com/splitbrain/dokuwiki.git' '/srv/www/wiki' && sudo chown -R 'nginx':'nginx' '/srv/www/wiki' && sync
+  sudo git clone --branch 'master' --depth '1' --recurse-submodules 'https://github.com/splitbrain/dokuwiki.git' '/var/www/wiki' && sudo semanage fcontext --add --type 'httpd_sys_rw_content_t' '/var/www/wiki(/.*)?' && sudo restorecon -F -I -R '/var/www/wiki' && sudo chown -R 'nginx':'nginx' '/var/www/wiki' && sync
 ====== nginx + PHP-FPM Configuration ======
@@ Line 27: / Line 27: @@
 ===== PHP-FPM Socket =====
-  * :!: [[https://github.com/splitbrain/dokuwiki/issues/3506|This report]] links to other reports of broken pages, and has a few different solutions. Disabling Pcre JIT fixes the rendering issue in this instance's case as of 2021/07/02, but doesn't seem to be necessary as of 2022/07/15
+  sudo -e '/etc/php-fpm.d/wiki.conf' && sudo systemctl restart 'php-fpm'
-  sudo -e '/etc/php8/fpm/php-fpm.d/wiki.conf' && sudo systemctl restart 'php-fpm'
 <code>
@@ Line 39: / Line 37: @@
 ; Socket
-listen = 127.0.0.1:9002
+listen = /run/php-fpm/wiki.sock
 listen.acl_users = nginx
 listen.allowed_clients = 127.0.0.1
@@ Line 48: / Line 46: @@
 pm.process_idle_timeout = 30
-; openSUSE TW php.ini Defaults
+; Fedora php.ini Defaults
-php_value[session.save_path] = /var/lib/php8/sessions
+php_value[session.save_handler] = "files"
+php_value[session.save_path] = "/var/lib/php/session"
 ; General
@@ Line 58: / Line 57: @@
 ;php_value[upload_max_filesize] = "10M"
 ;php_value[max_file_uploads] = "100"
-; DokuWiki
-;php_value[pcre.jit] = "0"
 ; End</code>
@@ Line 72: / Line 68: @@
 location ~ \.(php|phar)(/.*)?$ {
     fastcgi_split_path_info ^(.+\.(?:php|phar))(/.*)$;
     fastcgi_intercept_errors on;
     fastcgi_index doku.php;
@@ Line 79: / Line 74: @@
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param HTTPS on;
-    fastcgi_pass 127.0.0.1:9002;
+    fastcgi_pass unix:/run/php-fpm/wiki.sock;
 }</code>
@@ Line 90: / Line 85: @@
     listen '443' 'ssl' 'http2';
     server_name 'wiki.realmofespionage.xyz';
-    root '/srv/www/wiki';
+    root '/var/www/wiki';
     index 'doku.php';
@@ Line 160: / Line 155: @@
   * This prevents -- from becoming a – (long hyphen), which breaks some command's syntax
-  echo '--      --' | sudo tee '/srv/www/wiki/conf/entities.local.conf' > '/dev/null' && sudo chown 'nginx':'nginx' '/srv/www/wiki/conf/entities.local.conf' && sync
+  echo '--      --' | sudo tee '/var/www/wiki/conf/entities.local.conf' > '/dev/null' && sudo chown 'nginx':'nginx' '/var/www/wiki/conf/entities.local.conf' && sync
-====== Logs ======
-===== Enable =====
-  * Uncomment ''access_log'' and ''error_log''
-  sudo -e '/etc/nginx/vhosts.d/wiki.conf' && sudo systemctl reload 'nginx' && sync
-===== Logs =====
-  sudo -e '/var/log/nginx/wiki-access.log'
-  sudo -e '/var/log/nginx/wiki-error.log'
-===== Disable =====
-  * Comment ''access_log'' and ''error_log''
-  sudo -e '/etc/nginx/vhosts.d/wiki.conf' && sudo systemctl reload 'nginx' && sudo rm '/var/log/nginx/wiki-access.log' '/var/log/nginx/wiki-error.log' && sync
 ====== Services ======
@@ Line 195: / Line 170: @@
 Group=nginx
 Type=oneshot
-ExecStart='/usr/bin/git' -C '/srv/www/wiki' pull origin 'master'
+ExecStart='/usr/bin/git' -C '/var/www/wiki' pull origin 'master'
-ExecStartPost='/usr/bin/touch' '/srv/www/wiki/conf/local.php'
+ExecStartPost='/usr/bin/touch' '/var/www/wiki/conf/local.php'
-ExecStartPost='/usr/bin/sync'</code>
+ExecStartPost='/usr/bin/sync'
+# End</code>
 ==== Timer ====
-  * Every day at ''01:00:00''
+  * Every day at ''00:30:00''
   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 212: / Line 189: @@
 [Timer]
-OnCalendar=*-*-* 01:00:00
+OnCalendar=*-*-* 00:30:00
 Persistent=true
 [Install]
-WantedBy=timers.target</code>
+WantedBy=timers.target
+# End</code>
 ===== Maintenance =====
@@ Line 233: / Line 212: @@
 Group=nginx
 Type=oneshot
-WorkingDirectory=/srv/www/wiki
+WorkingDirectory=/var/www/wiki
-ExecStart='/usr/bin/git' -C '/srv/www/wiki' gc --aggressive --prune='all'
+ExecStart='/usr/bin/git' -C '/var/www/wiki' gc --aggressive --prune='all'
-ExecStart='/usr/bin/git' -C '/srv/www/wiki' fsck --full --strict
+ExecStart='/usr/bin/git' -C '/var/www/wiki' fsck --full --strict
-#ExecStart='/usr/bin/bash' -c "find '/srv/www/wiki/data'/{attic,cache,locks,media_attic}/ -type 'f' -mtime +'90' -delete"
+#ExecStart='/usr/bin/bash' -c "find '/var/www/wiki/data'/{attic,cache,locks,media_attic}/ -type 'f' -mtime +'90' -delete"
-ExecStart='/usr/bin/bash' -c "find '/srv/www/wiki/data'/{attic,cache,index,locks,media,media_attic,media_meta,meta,pages,tmp}/ -mindepth '1' -type 'd' -empty -delete"
+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' '/srv/www/wiki/bin/indexer.php' --clear
+ExecStart='/usr/bin/php' '/var/www/wiki/bin/indexer.php' --clear
-ExecStartPost='/usr/bin/sync'</code>
+ExecStartPost='/usr/bin/sync'
+# End</code>
 ==== Timer ====
-  * ''01'' day of every month at ''01:20:00''
+  * ''01'' day of every month at ''01:00:00''
   sudo -e '/etc/systemd/system/wiki-m.timer' && sudo systemctl daemon-reload && sudo systemctl enable 'wiki-m.timer' --now
@@ Line 252: / Line 233: @@
 [Timer]
-OnCalendar=*-*-01 01:20:00
+OnCalendar=*-*-01 01:00:00
 Persistent=true
 [Install]
-WantedBy=timers.target</code>
+WantedBy=timers.target
+# End</code>
 ===== Backup =====
@@ Line 265: / Line 248: @@
   * :!: The extra ''ExecStart''s are additional backup locations that expect [[servers:vsftpd|vsftpd]]
-  * TODO: Figure out Keybase and set a path here
   mkdir -p ~/'backups' && sudo -e '/etc/systemd/system/wiki-fb.service' && sudo sed -i 's/CHANGEME/'$USER'/g' '/etc/systemd/system/wiki-fb.service'
@@ Line 272: / Line 254: @@
 [Service]
 Type=oneshot
-WorkingDirectory=/srv/www/wiki
+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" "data/pages" "data/meta" "data/media" "data/media_meta" "data/attic" "data/media_attic" "conf"'
 #ExecStart='/usr/bin/bash' -c '"/usr/bin/tar" -czf "/srv/ftp/nas1/espionage724/Servers/Scheduled Backups/dokuwiki-files-auto-"$$(date +%%Y-%%m-%%d)".tar.gz" "data/pages" "data/meta" "data/media" "data/media_meta" "data/attic" "data/media_attic" "conf"'
 #ExecStart='/usr/bin/bash' -c '"/usr/bin/tar" -czf "/srv/ftp/nas2/Servers/Scheduled Backups/dokuwiki-files-auto-"$$(date +%%Y-%%m-%%d)".tar.gz" "data/pages" "data/meta" "data/media" "data/media_meta" "data/attic" "data/media_attic" "conf"'
-ExecStartPost='/usr/bin/sync'</code>
+ExecStartPost='/usr/bin/sync'
-=== Keybase ===
+# End</code>
-  * https://book.keybase.io/docs/files/details#mountpoints
-  * :!: TODO: This doesn't work; can't immediately copy root:root file to that KBFS folder so it needs to be owned by that user, but the entire script is ran as-root. Create entirely different script just to copy the file from ''~/backups''?
-<code>
-#ExecStart='/usr/bin/bash' -c '"/usr/bin/tar" -czf "/run/user/1000/keybase/kbfs/private/espionage724/Servers/Scheduled Backups/dokuwiki-files-auto-"$$(date +%%Y-%%m-%%d)".tar.gz" "data/pages" "data/meta" "data/media" "data/media_meta" "data/attic" "data/media_attic" "conf"'</code>
 ==== Timer ====
-  * Every day at ''01:50:00''
+  * Every day at ''01:30:00''
   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 297: / Line 273: @@
 [Timer]
-OnCalendar=*-*-* 01:50:00
+OnCalendar=*-*-* 01:30:00
 Persistent=true
 [Install]
-WantedBy=timers.target</code>
+WantedBy=timers.target
+# End</code>
 ====== Backup ======
@@ Line 313: / Line 291: @@
 ****
-  cd '/srv/www/wiki' && sudo tar -cvzf ~/'dokuwiki-files-manual-'$(date +%Y-%m-%d)'.tar.gz' 'data/pages' 'data/meta' 'data/media' 'data/media_meta' 'data/attic' 'data/media_attic' 'conf' && cd ~ && sync
+  cd '/var/www/wiki' && sudo tar -cvzf ~/'dokuwiki-files-manual-'$(date +%Y-%m-%d)'.tar.gz' 'data/pages' 'data/meta' 'data/media' 'data/media_meta' 'data/attic' 'data/media_attic' 'conf' && cd ~ && sync
 ===== Client =====
@@ Line 351: / Line 329: @@
 ****
-  ls ~/'dokuwiki-files-'*'.tar.gz' && sudo rm -Rf '/srv/www/wiki/data/pages' '/srv/www/wiki/data/meta' '/srv/www/wiki/data/media' '/srv/www/wiki/data/media_meta' '/srv/www/wiki/data/attic' '/srv/www/wiki/data/media_attic' '/srv/www/wiki/conf'
+  ls ~/'dokuwiki-files-'*'.tar.gz' && sudo rm -Rf '/var/www/wiki/data/pages' '/var/www/wiki/data/meta' '/var/www/wiki/data/media' '/var/www/wiki/data/media_meta' '/var/www/wiki/data/attic' '/var/www/wiki/data/media_attic' '/var/www/wiki/conf'
 ==== Restore Folders ====
@@ Line 357: / Line 335: @@
 ****
-  cd '/srv/www/wiki' && sudo tar -xvzf ~/'dokuwiki-files-'*'.tar.gz' 'data/pages' 'data/meta' 'data/media' 'data/media_meta' 'data/attic' 'data/media_attic' 'conf' && sudo chown -R 'nginx':'nginx' '/srv/www/wiki' && cd ~ && sync
+  cd '/var/www/wiki' && sudo tar -xvzf ~/'dokuwiki-files-'*'.tar.gz' 'data/pages' 'data/meta' 'data/media' 'data/media_meta' 'data/attic' 'data/media_attic' 'conf' && sudo restorecon -F -I -R '/var/www/wiki' && sudo chown -R 'nginx':'nginx' '/var/www/wiki' && cd ~ && sync
 ==== Start nginx ====