Merge branch 'mysqldump-options' into 'master'

mysqldump params can be customized in jobs/env

See merge request !117

docs/30_Configuration/60_File_env.md

@@ -3,6 +3,8 @@ Here you can set custom environment variables.
 
 A common usage is extending the variable PATH to execute binaries that are not located in any directory.
 
+WIP: Or you can override used parameters during backup. The parameters for mysqldump are in env_defaults. If you want to change them then put ``LD_MYSQL_DUMP_PARAMS=...`` into env file.
+
 Example:
 
 This might be helpful on MS Windows. If you put the restic binary "somewhere" eg. c:\portable\restic\restic.exe then you can add the path to the env file:

docs/style.css

 /*
     override css elements of daux.io blue theme
-    version 2022-11-30
+    version 2023-10-09
 */
 :root {
     /* Axels Overrides */
-    --color-text: #222;
+    --color-text: #234;
     --link-color: #822;
-    --brand-color: var(--color-secondary);
+    --brand-color: var(--color-text);
     --brand-background: var(--body-background);
     --hr-color: none;
     --search-field-background: none;
@@ -24,27 +24,29 @@
     --axel_brand-pre-background-hover: rgb(255, 0, 51);
     ;
     --axel_h1_header: none;
-    --axel_h1: #345;
+    --axel_h1: #111;
     --axel_h1-bg: none;
     --axel_h1-bottom: 3px solid none;
-    --axel_h2: #156;
-    --axel_h2-bg: #f8fafb;
-    --axel_h2-bottom: 2px solid #467;
+    --axel_h2: #222;
+    --axel_h2-bg: none;
+    --axel_h2-bottom: 0px solid #467;
     --axel_h2-hero-bottom: 2px solid #912;
-    --axel_h3: #278;
-    --axel_h3-bottom: 1px solid #ddd;
+    --axel_h3: #333;
+    --axel_h3-bottom: 0px solid #ddd;
+    --axel_h4: #444;
     --axel_hero_bg: #f8f8f8;
+    --axel_img-border: 2px dashed #ccc;
     --axel_nav-bg: #fcfcfc;
     --axel_nav-buttomborder: #ddd;
     --axel_pre-background: #f8f8f8;
-    --axel-th-background: #d0e0e8;
+    --axel-th-background: #e0e4e8;
     --axel-article-nav-border-top: 0px dotted #ddd;
 }
 
 .dark {
     /* Axels Overrides */
     --color-text: #c0c0c0;
-    --link-color: #b44;
+    --link-color: #c66;
     --brand-color: var(--color-text);
     --brand-background: var(--body-background);
     --hr-color: none;
@@ -63,16 +65,17 @@
     --axel_brand-pre-background-hover: rgb(255, 0, 51);
     ;
     --axel_h1_header: none;
-    --axel_h1: #777;
+    --axel_h1: #578;
     --axel_h1-bg: none;
     --axel_h1-bottom: none;
     --axel_h2: #467;
-    --axel_h2-bg: #202020;
-    --axel_h2-bottom: 2px solid #256;
+    --axel_h2-bg: none;
+    --axel_h2-bottom: 0px solid #256;
     --axel_h2-hero-bottom: 2px solid #712;
     --axel_h3: #589;
-    --axel_h3-bottom: 1px solid #333;
+    --axel_h3-bottom: 0px solid #333;
     --axel_hero_bg: #242424;
+    --axel_img-border: 2px dashed #555;
     --axel_nav-bg: #242424;
     --axel_nav-buttomborder: #555;
     --axel_pre-background: #bcc;
@@ -133,7 +136,7 @@ a.Brand {
 .s-content h2 {
     background: var(--axel_h2-bg);
     color: var(--axel_h2);
-    font-size: 180%;
+    font-size: 190%;
     font-weight: bold;
     margin-top: 4em;
     border-bottom: var(--axel_h2-bottom);
@@ -147,6 +150,12 @@ h2:first-of-type {
     margin-top: 0em;
 }
 
+img{
+    border: var(--axel_img-border);
+    border-radius: 1.5em;
+    padding: 0.7em;
+}
+
 .s-content h3 {
     background: var(--axel_h3-bg);
     color: var(--axel_h3);
@@ -156,14 +165,24 @@ h2:first-of-type {
     border-bottom: var(--axel_h3-bottom);
 }
 
-.s-content h4 {
-    margin: 0;
+
+.s-content > h4 {
+    color: var(--axel_h4);
+    font-size: 135%;
+    font-weight: bold;
+    margin: 2em 0;
+}
+
+.s-content .TableOfContentsContainer h4 {
+    margin: 1em 0;
     font-size: 100%;
     text-align: center;
     background-color: rgba(0, 0, 0, 0.05);
     padding: 0.3em;
 }
-
+ul.TableOfContents a{
+    color: var(--color-text);
+}
 .s-content pre {
     background: var(--axel_pre-background);
 }
@@ -264,4 +283,4 @@ ul.TableOfContents ul {
 
 .Links a[href^="https://os-docs.iml.unibe.ch"]::before {
     content: '📗 ';
-}
+}
\ No newline at end of file

jobhelper.sh

@@ -15,6 +15,7 @@
 # 2022-10-07  ah     v1.4  unescape regex with space to prevent "grep: warning: stray \ before white space"
 # 2023-03-17  ah     v1.5  ignore required user on MS windows; source jobs/env if it exists; use varaiable FQDN
 # 2023-04-12  ah     v1.6  add desktop notification
+# 2023-10-06         v1.7  source jobs/env_defaults
 # ================================================================================
 
 
@@ -43,6 +44,7 @@ STORAGEFILE="${DIR_JOBS}/transfer.job"
 function j_init(){
 
   j_banner
+  . "${DIR_JOBS}/env_defaults"
   if [ -r "${DIR_JOBS}/env" ];
   then
     echo "INFO: loading custom environment ${DIR_JOBS}/env"

jobs/env_defaults

+#!/bin/bash
+# ----------------------------------------------------------------------
+#
+# DEFAULTS !!! Do not edit this file !!! 
+# Overide customizations in file "env" (maybe copy env.dist to env first)
+#
+# ----------------------------------------------------------------------
+
+# ----------------------------------------------------------------------
+# Localdump
+# ----------------------------------------------------------------------
+
+# mysql
+LD_MYSQL_DUMP_PARAMS="--opt \
+            --default-character-set=utf8 \
+            --flush-logs \
+            --single-transaction \
+            --no-autocommit \
+            "
+
+# ----------------------------------------------------------------------
\ No newline at end of file

plugins/localdump/mysql.sh

@@ -15,6 +15,7 @@
 # 2022-03-17         v2.2  WIP: add lines with prefix __DB__
 # 2022-03-21         v2.3  Check if the created dump contains "insert" 
 # 2022-03-24         v2.4  On empty dumps: detect if source db is empty too
+# 2023-10-06         v2.5  mysqldump params can be customized in jobs/env
 # ================================================================================
 
 if [ -z "$LOCALDUMP_LOADED" ]; then
@@ -78,6 +79,9 @@ function mysql.db.create(){
 
 # dump [database] --> [file] 
 # dump a single database into given file
+#
+# global LD_MYSQL_DUMP_PARAMS  string  parameters from file jobs/env_defaults
+#
 # param  string  name of database to dump
 # param  string  name of output file
 function mysql.db.dump(){
@@ -85,13 +89,7 @@ function mysql.db.dump(){
   local _dbname=$1
   local _dumpfile=$2
 
-  mysqldump --opt \
-            --default-character-set=utf8 \
-            --flush-logs \
-            --single-transaction \
-            --no-autocommit \
-            --result-file="$_dumpfile" \
-            "$_dbname" 2>&1
+  mysqldump $LD_MYSQL_DUMP_PARAMS --result-file="$_dumpfile" "$_dbname" 2>&1
   fetchrc >/dev/null
 
   if [ $myrc -eq 0 ]; then