From 7b769cebfecacbf0b899c83e73e8e7f96b3248b3 Mon Sep 17 00:00:00 2001
From: wizzdom <wizzdom@redbrick.dcu.ie>
Date: Sat, 1 Mar 2025 01:51:17 +0100
Subject: [PATCH] wiki: use utf8 encoding, improve db performance, more backups
 (#100)

* wiki: use utf8 encoding, improve db performance, more backups

* add medik skin colour, logo
---
 jobs/services/wiki/LocalSettings.php    |  6 +++++-
 jobs/services/wiki/mediawiki-backup.hcl |  6 +++---
 jobs/services/wiki/mediawiki.hcl        | 17 +++++++++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/jobs/services/wiki/LocalSettings.php b/jobs/services/wiki/LocalSettings.php
index bc0e6ef..bad898e 100644
--- a/jobs/services/wiki/LocalSettings.php
+++ b/jobs/services/wiki/LocalSettings.php
@@ -41,7 +41,7 @@ $wgDBpassword = "{{ key "mediawiki/db/password" }}";
 # MySQL specific settings
 $wgDBprefix = "rbwiki_";
 # MySQL table options to use during installation or update
-$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=binary";
+$wgDBTableOptions = "ENGINE=InnoDB, DEFAULT CHARSET=utf8mb4";
 
 ## Shared memory settings
 $wgMainCacheType = CACHE_NONE;
@@ -89,11 +89,15 @@ wfLoadSkin( 'Vector' );
 wfLoadSkin( 'Citizen' );
 wfLoadSkin( 'Timeless' );
 wfLoadSkin( 'MinervaNeue' );
+wfLoadSkin( 'Medik' );
 
 $wgCitizenThemeColor = "#a81e22";
 $wgCitizenShowPageTools = "permission";
 $wgCitizenSearchDescriptionSource = "pagedescription";
 
+$wgMedikColor = "#a81e22";
+$wgMedikShowLogo = "main";
+
 $wgLocalisationUpdateDirectory = "$IP/cache";
 
 # load extensions
diff --git a/jobs/services/wiki/mediawiki-backup.hcl b/jobs/services/wiki/mediawiki-backup.hcl
index bbef3e3..add8b71 100644
--- a/jobs/services/wiki/mediawiki-backup.hcl
+++ b/jobs/services/wiki/mediawiki-backup.hcl
@@ -17,7 +17,7 @@ job "mediawiki-backup" {
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 #!/bin/bash
 
 file=/storage/backups/nomad/wiki/mysql/rbwiki-mysql-$(date +%Y-%m-%d_%H-%M-%S).sql
@@ -30,7 +30,7 @@ job_name=$(echo ${NOMAD_JOB_NAME} | cut -d "/" -f 1)
 
 nomad alloc exec -task rbwiki-db $alloc_id mariadb-dump -u {{ key "mediawiki/db/username" }} -p'{{ key "mediawiki/db/password"}}' {{ key "mediawiki/db/name" }} > "${file}"
 
-find /storage/backups/nomad/wiki/mysql/rbwiki-mysql* -ctime +3 -exec rm {} \; || true
+find /storage/backups/nomad/wiki/mysql/rbwiki-mysql* -ctime +30 -exec rm {} \; || true
 
 if [ -s "$file" ]; then # check if file exists and is not empty
   echo "Backup successful"
@@ -56,7 +56,7 @@ EOH
       }
 
       template {
-        data = <<EOH
+        data        = <<EOH
 #!/bin/bash
 
 file=/storage/backups/nomad/wiki/xml/rbwiki-dump-$(date +%Y-%m-%d_%H-%M-%S).xml
diff --git a/jobs/services/wiki/mediawiki.hcl b/jobs/services/wiki/mediawiki.hcl
index 1344f89..329472d 100644
--- a/jobs/services/wiki/mediawiki.hcl
+++ b/jobs/services/wiki/mediawiki.hcl
@@ -213,6 +213,18 @@ EOH
       template {
         data = <<EOH
 [mysqld]
+# Ensure full UTF-8 support
+character-set-server = utf8mb4
+collation-server = utf8mb4_unicode_ci
+skip-character-set-client-handshake
+
+# Fix 1000-byte key length issue
+innodb_large_prefix = 1
+innodb_file_format = Barracuda
+innodb_file_per_table = 1
+innodb_default_row_format = dynamic
+
+# Performance optimizations (Keep these based on your system)
 max_connections = 100
 key_buffer_size = 2G
 query_cache_size = 0
@@ -224,13 +236,14 @@ innodb_io_capacity = 200
 tmp_table_size = 5242K
 max_heap_table_size = 5242K
 innodb_log_buffer_size = 16M
-innodb_file_per_table = 1
 
-bind-address = 0.0.0.0
 # Logging
 slow_query_log = 1
 slow_query_log_file = /var/log/mysql/slow.log
 long_query_time = 1
+
+# Network
+bind-address = 0.0.0.0
 EOH
 
         destination = "local/conf.cnf"