From 06217a3b93b8839354b1b0808e24bd3e6dce5bbd Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 17 Jan 2025 21:19:22 +0100 Subject: [PATCH] some minor changes on sample configuration files. --- conf/borg2-backup-nc.conf.sample | 2 +- conf/borg2-backup.conf.BAK.backup.oopen.de | 268 --------------------- conf/borg2-backup.conf.sample | 2 +- 3 files changed, 2 insertions(+), 270 deletions(-) delete mode 100644 conf/borg2-backup.conf.BAK.backup.oopen.de diff --git a/conf/borg2-backup-nc.conf.sample b/conf/borg2-backup-nc.conf.sample index 352daa9..10e1fa5 100644 --- a/conf/borg2-backup-nc.conf.sample +++ b/conf/borg2-backup-nc.conf.sample @@ -128,7 +128,7 @@ # - SET GLOBAL foreign_key_checks='OFF' # - SET GLOBAL unique_checks='OFF' # - SET GLOBAL innodb_flush_log_at_trx_commit=2 -# SET GLOBAL max_allowed_packet=1073741824 +# - SET GLOBAL max_allowed_packet=1073741824 # # After the databases have been backed up, the values are reset. # diff --git a/conf/borg2-backup.conf.BAK.backup.oopen.de b/conf/borg2-backup.conf.BAK.backup.oopen.de deleted file mode 100644 index 1c95305..0000000 --- a/conf/borg2-backup.conf.BAK.backup.oopen.de +++ /dev/null @@ -1,268 +0,0 @@ -#----------------------------- -# Settings for script borg2-backup-nc.sh -#----------------------------- - -# SSH_USER -# -# The (remote) user under which the SSH session for the -# data transfer is running. -# -# Defaults to: -# -# SSH_USER="borg" -# -#BACKUP_USER="borg" - - -# SSH_PORT -# -# The port under which the SSH service is accessible -# -# Defaults to: -# -# SSH_PORT=22 -# -#SSH_PORT=22 - - -# BORG_HOST -# -# The (remote) host on which the backups are saved. -# -# !! No Defaults - this parameter is mandatory -# -#BORG_HOST="" -BORG_HOST="backup.warenform.de" - - -# BORG_RSH -# -# The command, which is used instead of ssh. -# -# This can be used to specify ssh options, such as a custom identity file -# ssh -i /path/to/private/key. See man ssh for other options. -# -# Using the --rsh CMD commandline option overrides the environment variable. -# -# Defaults to: -# BORG_RSH='ssh -i /root/.ssh/id_ed25519-borg-backup' -# -#BORG_RSH='ssh -i /root/.ssh/id_ed25519-borg-backup' - - -# BORG_PASSPHRASE -# -# Password of the Borg Repository (which was used while initializing) -# -# !! No Defaults - this parameter is mandatory -# -#BORG_PASSPHRASE='borg-password' -BORG_PASSPHRASE='aeHj7z5s/.j-_+gbSG/Zfz%4' - - -# BORG_REPO -# -# The repository location on the (remote) backup host. -# -# !! No Defaults - this parameter is mandatory -# -#BORG_REPO= -BORG_REPO="/backup/BORG-2/backup.oopen.de" - - -# BORG_LOG_DIR -# -# Log to this directory -# -# Defaults to: -# -# BORG_LOG_DIR="/var/log/borg" -# -#BORG_LOG_DIR="/var/log/borg" - - -# --- -# DB related parameters -# --- - -# DB_TYPE -# -# Which database ist installed? -# -# possible values: -# - MySQL -# - PostgreSQL or postgres or psql -# - None -# -# Defaults to: -# -# DB_TYPE="None" -# -# DB_TYPE="None" -DB_TYPE="MySQL" - - -# MYSQL_CREDENTIALS -# -# Giving password on command line is insecure an sind mysql 5.5 -# you will get a warning doing so. -# -# Reading username/password fro file ist also possible, using MySQL/MariaDB -# commandline parameter '--defaults-file'. -# -# Since Version 5.6, that method is considered as insecure. -# To avoid giving the password on command line, we use an -# encrypted option file -# -# Create (encrypted) option file: -# $ mysql_config_editor set --login-path=local --socket=/var/run/mysqld/mysqld.sock --user=backup --password -# $ Password: -# -# Use of option file: -# $ mysql --login-path=local ... -# -# Example -# MYSQL_CREDENTIALS="--login-path=local" -# MYSQL_CREDENTIALS="--defaults-file=/etc/mysql/debian.cnf" (Debian default) -# MYSQL_CREDENTIALS="--defaults-file=/usr/local/mysql/sys-maint.cnf" -# -# Defaults to: -# -# MYSQL_CREDENTIALS="-u root -S /run/mysqld/mysqld.sock" -# -#MYSQL_CREDENTIALS="-u root -S /run/mysqld/mysqld.sock" - - -# PSQL_SYSTEM_USER -# -# User who owns PostgreSQL services -# -# Defaults to: -# -# PSQL_SYSTEM_USER="postgres" -# -#PSQL_SYSTEM_USER="postgres" - - -# DB_BACKUP_DIR -# -# Directory in which current database dumps are stored (and transferred to the repository) -# -# Defaults to: -# -# DB_BACKUP_DIR="/data/backup/sql" -# -#DB_BACKUP_DIR="/data/backup/sql" - - -# --- -# Backups directories -# --- - -# BACKUP_DIRECTORIES -# -# Directories (or files) that should be backed up -# -# Defaults to: -# -# BACKUP_DIRECTORIES="/etc /home /root /var/spool/cron" -# -# - Blank separated list of directories - -# -#BACKUP_DIRECTORIES="/etc /home /root /var/spool/cron" -BACKUP_DIRECTORIES="/etc /home /root /var/spool/cron" - - -# KEEP_DAILY -# -# Number of daily archives to keep -# -# Defaults to: -# -# KEEP_DAILY=10 -# -#KEEP_DAILY=10 - - -# KEEP_WEEKLY -# -# Number of weekly archives to keep -# -# Defaults to: -# -# KEEP_WEEKLY=5 -# -#KEEP_WEEKLY=5 - - -# KEEP_MONTHLY -# -# Number of monthly archives to keep -# -# Defaults to: -# -# KEEP_MONTHLY=6 -# -#KEEP_MONTHLY=6 - - -# KEEP_YEARLY -# -# Number of yearly archives to keep -# -# Defaults to: -# -# KEEP_YEARLY=1 -# -#KEEP_YEARLY=1 - - -# --- -# Restore Parameters -# --- - -# BORG_FUSE_MOUNT_DIR -# -# Mountpoint where to mount an borg backup archiv as a FUSE filesystem. -# -# Defaults to: -# -# BORG_MOUNT_FUSE_DIR="/mnt/borg-fuse-mount" -# -#BORG_MOUNT_FUSE_DIR="/mnt/borg-fuse-mount" - - -# --- -# Alert Parameters -# --- - -# ADMIN_EMAIL -# -# Send Informations about the backup prozess to this e-mail address -# -# Defaults to: -# -# ADMIN_EMAIL="root" -# -#ADMIN_EMAIL="root" - - -# FROM_ADDRESS -# -# Defaults to: -# -# "borg-backup@$(hostname -f)" -# -#FROM_ADDRESS="" - - -# COMPANY -# -# DEFAULTS to -# Defaults to: -# -# COMPANY="O.OPEN" -# -#COMPANY="O.OPEN" -COMPANY="O.OPEN" - diff --git a/conf/borg2-backup.conf.sample b/conf/borg2-backup.conf.sample index 781d82a..c80abf4 100644 --- a/conf/borg2-backup.conf.sample +++ b/conf/borg2-backup.conf.sample @@ -139,7 +139,7 @@ # - SET GLOBAL foreign_key_checks='OFF' # - SET GLOBAL unique_checks='OFF' # - SET GLOBAL innodb_flush_log_at_trx_commit=2 -# SET GLOBAL max_allowed_packet=1073741824 +# - SET GLOBAL max_allowed_packet=1073741824 # # After the databases have been backed up, the values are reset. #