Compare commits

..

36 Commits

Author SHA1 Message Date
4cd270ac54 Merge remote-tracking branch 'origin/master' into debian 2024-03-17 17:58:12 +01:00
553d15e38b updated/ generalised backup scripts 2024-03-17 17:58:00 +01:00
e37268fd88 Merge remote-tracking branch 'origin/master' into debian 2024-03-17 14:14:57 +01:00
46e9aea2dd fix: make functions known before usage 2024-03-17 14:14:34 +01:00
f23a40f524 Merge remote-tracking branch 'origin/master' into debian 2024-03-17 14:09:24 +01:00
7b1d0ef251 made script more robust 2024-03-17 14:08:34 +01:00
36e122b62c improved/ modernised "ex"-function 2024-03-17 14:01:36 +01:00
96893dff23 Merge remote-tracking branch 'origin/master' into debian 2024-01-18 16:29:16 +01:00
707b581b88 updated config 2024-01-18 16:15:59 +01:00
31e618be9e Merge remote-tracking branch 'origin/master' into debian 2024-01-18 15:53:02 +01:00
236672fd44 Merge remote-tracking branch 'origin/master' into debian 2023-09-24 15:20:56 +02:00
6f16c5e710 Merge remote-tracking branch 'origin/master' into debian 2023-09-17 14:43:55 +02:00
8e29301d96 Merge remote-tracking branch 'origin/master' into debian 2023-09-17 14:33:42 +02:00
6fb25215b5 Merge remote-tracking branch 'origin/master' into debian 2023-08-20 17:32:10 +02:00
812805ced5 Merge remote-tracking branch 'origin/master' into debian 2023-08-20 14:49:40 +02:00
632a0c6741 Merge remote-tracking branch 'origin/master' into debian 2023-07-30 09:56:57 +02:00
25065ea703 Merge remote-tracking branch 'origin/master' into debian 2023-07-06 15:39:29 +02:00
fd9dba9f12 Merge remote-tracking branch 'origin/master' into debian 2023-07-06 13:00:17 +02:00
3d740f1c3b Merge branch 'master' into debian 2023-06-02 16:03:05 +02:00
647831e860 improved automatic updates via executeAndNotify to enable fire-and-forget 2023-06-02 15:57:57 +02:00
452fd7600d new function to update debian based systems 2023-05-31 10:55:35 +02:00
d84d9e6933 Merge branch 'debian' of ssh://git.szimnau.de:222/fabian/sync into debian 2023-05-31 10:42:56 +02:00
12e5c3e2b1 - commented out options not working in ancient debian version 2023-05-31 10:42:41 +02:00
49335145fd Revert "Revert "old raspi version of nanorc cannot handle certain settings""
This reverts commit 844fe85d6d.
2023-05-31 10:42:41 +02:00
ec5a09da64 Merge remote-tracking branch 'origin/master' into debian 2023-05-27 18:14:45 +02:00
bb277234ea Merge branch 'master' into debian 2023-05-19 18:34:17 +02:00
2d4027379b Merge branch 'master' into debian 2023-05-19 15:14:21 +02:00
d59183ad63 Merge branch 'master' into debian 2023-05-14 12:50:49 +02:00
2233d47782 Merge remote-tracking branch 'origin/master' into debian 2023-05-14 12:20:09 +02:00
1d3d82aa5b Merge branch 'debian' of git.szimnau.de:fabian/sync into debian 2023-05-14 12:19:05 +02:00
d6cc45381e - commented out options not working in ancient debian version 2023-05-14 12:18:13 +02:00
de22a1668e Merge remote-tracking branch 'origin/master' into debian 2023-05-06 15:19:37 +02:00
6c283839fb Merge remote-tracking branch 'origin/master' into debian 2023-05-06 06:10:23 +02:00
682dc5f18a Merge remote-tracking branch 'origin/master' into debian 2023-05-06 05:45:19 +02:00
ea7c081bd4 Merge remote-tracking branch 'origin/master' into debian 2023-05-06 04:57:15 +02:00
5881642a40 Revert "Revert "old raspi version of nanorc cannot handle certain settings""
This reverts commit 844fe85d6d.
2023-05-06 04:11:17 +02:00
9 changed files with 99 additions and 56 deletions

View File

@ -4,13 +4,18 @@
updatePackages() {
noconfirm=
if [[ $1 == "-y" ]]; then
noconfirm="--no-confirm";
noconfirm="--assume-yes"
fi
executeAndNotify "doUpdatePackages $noconfirm" "packages updated" "package update failed";
full=
if [[ $2 == "--full" ]]; then
full="full-"
fi
executeAndNotify "doUpdatePackages $noconfirm $full" "system updated" "system update failed";
}
doUpdatePackages() {
pamac update $1;
pamac remove --orphans --cascade $1;
sudo apt update;
sudo apt ${2}upgrade $1;
sudo apt autoremove $1;
}

View File

@ -186,26 +186,29 @@ colours() {
# ex - archive extractor
# usage: ex <file>
ex ()
{
if [ -f $1 ] ; then
case $1 in
*.tar.bz2) tar xjf $1 ;;
*.tar.gz) tar xzf $1 ;;
*.bz2) bunzip2 $1 ;;
*.rar) unrar x $1 ;;
*.gz) gunzip $1 ;;
*.tar) tar xf $1 ;;
*.tbz2) tar xjf $1 ;;
*.tgz) tar xzf $1 ;;
*.zip) unzip $1 ;;
*.Z) uncompress $1;;
*.7z) 7z x $1 ;;
*) echo "'$1' cannot be extracted via ex()" ;;
esac
else
echo "'$1' is not a valid file"
fi
ex() {
if [[ ! -f "$1" ]]; then
echo "'$1' is not a valid file"
return 1;
fi
# FIXME 7z kann (theoretisch) tar
outdir=${1%.*}
case "$1" in
*.tar.bz2 | *.tbz | *.tbz2)
tar xjf $1 -C $outdir;;
*.tar.gz | *.tgz)
tar xzf $1 -C $outdir;;
*.tar)
tar xf $1 -C $outdir;;
*.7z | *.zip | *.gz | *.bz | *.bz2)
7z x -o$outdir $1;;
*.rar)
unrar x $1;;
*.Z)
uncompress $1;;
*)
echo "'$1' cannot be extracted via ex()";;
esac
}
# BEGIN_KITTY_SHELL_INTEGRATION

View File

@ -89,7 +89,7 @@ set linenumbers
set matchbrackets "(<[{)>]}"
## Suppress title bar and show file name and editor state at the bottom.
set minibar
# set minibar
## Enable mouse support, if available for your system. When enabled,
## mouse clicks can be used to place the cursor, set the mark (with a

View File

@ -139,13 +139,13 @@ configuration {
/* me-select-entry: "MousePrimary";*/
/* me-accept-entry: "MouseDPrimary";*/
/* me-accept-custom: "Control+MouseDPrimary";*/
timeout {
/* timeout {
action: "kb-cancel";
delay: 0;
}
filebrowser {
directories-first: true;
sorting-method: "name";
}
}*/
}
@theme "/usr/share/rofi/themes/Arc-Dark.rasi"

View File

@ -63,10 +63,6 @@ PasswordAuthentication no
# Change to yes to enable challenge-response passwords (beware issues with
# some PAM modules and threads)
# FIXME! outdated/ replaced by KbdInteractiveAuthentication?
ChallengeResponseAuthentication no
# Change to no to disable s/key passwords
KbdInteractiveAuthentication no
# Kerberos options
@ -86,7 +82,7 @@ KbdInteractiveAuthentication no
# be allowed through the KbdInteractiveAuthentication and
# PasswordAuthentication. Depending on your PAM configuration,
# PAM authentication via KbdInteractiveAuthentication may bypass
# the setting of "PermitRootLogin without-password".
# the setting of "PermitRootLogin prohibit-password".
# If you just want the PAM account and session checks to run without
# PAM authentication, then enable this but set PasswordAuthentication
# and KbdInteractiveAuthentication to 'no'.
@ -122,10 +118,10 @@ PrintMotd no # pam does that
AcceptEnv LANG LC_*
# override default of no subsystems
# DEACTIVATED because no need for sftp and differences between debian and arch
# debian
Subsystem sftp /usr/lib/openssh/sftp-server
# arch
# DEACTIVATED because no need for sftp and differences between debian and arch
# Subsystem sftp /usr/lib/ssh/sftp-server
# Example of overriding settings on a per-user basis

View File

@ -1,28 +1,32 @@
#!/usr/bin/env bash
set -euo pipefail
source /sync/home_external/.bash_aliases
source /sync/scripts/backup_resources.sh
# FSFIXME expand_aliases still needed?
shopt -s expand_aliases # make aliases work
###############################
### update local backup dir ###
###############################
BACKUP_DIR=/sync/backup
ensureDirectory $BACKUP_DIR
BACKUP_DIR_HOME=$BACKUP_DIR/home
rsync_backup $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/
ensureDirectory $BACKUP_DIR_HOME
backupDirectory $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/
BACKUP_DIR_ROOT=$BACKUP_DIR/root/etc
sd rsync_backup /etc/ddclient/ $BACKUP_DIR_ROOT/ddclient/
sd rsync_backup /etc/ddclient.conf $BACKUP_DIR_ROOT/
sd rsync_backup /etc/letsencrypt/ $BACKUP_DIR_ROOT/letsencrypt/
sd rsync_backup /etc/nginx/ $BACKUP_DIR_ROOT/nginx/
sd rsync_backup /etc/ssh/ $BACKUP_DIR_ROOT/ssh/
sd rsync_backup /etc/wireguard/ $BACKUP_DIR_ROOT/wireguard/
sd rsync_backup /etc/hosts $BACKUP_DIR_ROOT/
sd rsync_backup /etc/docker/daemon.json $BACKUP_DIR_ROOT/docker/
ensureRootDirectory $BACKUP_DIR_ROOT
sd rsync_backup /etc/hosts $BACKUP_DIR_ROOT/
sd rsync_backup /etc/ddclient.conf $BACKUP_DIR_ROOT/
backupRootDirectory /etc/ddclient/ $BACKUP_DIR_ROOT/ddclient/
backupRootDirectory /etc/letsencrypt/ $BACKUP_DIR_ROOT/letsencrypt/
backupRootDirectory /etc/nginx/ $BACKUP_DIR_ROOT/nginx/
backupRootDirectory /etc/ssh/ $BACKUP_DIR_ROOT/ssh/
backupRootDirectory /etc/wireguard/ $BACKUP_DIR_ROOT/wireguard/
backupRootDirectory /etc/docker/daemon.json $BACKUP_DIR_ROOT/docker/
#####################
### upload backup ###
@ -34,3 +38,4 @@ fi
sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" --filter="P /home/docker" /sync/backup/ fabian@garrus:/citadel/backup/edi/
sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" /home/edi/docker/ fabian@garrus:/citadel/backup/edi/home/docker/
echo "Note: remember to keep /citadel in sync!"

View File

@ -1,22 +1,22 @@
#!/usr/bin/env bash
set -euo pipefail
source /sync/home_external/.bash_aliases
source /sync/scripts/backup_resources.sh
# FSFIXME expand_aliases still needed?
shopt -s expand_aliases # make aliases work
###############################
### update local backup dir ###
###############################
BACKUP_DIR=/sync/backup
ensureDirectory $BACKUP_DIR
BACKUP_DIR_HOME=$BACKUP_DIR/home
if [[ !($HOME/.bash_aliases_local -ef $BACKUP_DIR_HOME/.bash_aliases_local) ]]; then
ln $HOME/.bash_aliases_local $BACKUP_DIR_HOME/.bash_aliases_local
fi
ensureDirectory $BACKUP_DIR_HOME
BACKUP_DIR_ROOT=$BACKUP_DIR/root/etc
rsync_backup --link-dest="/etc/ssh/" /etc/ssh/ $BACKUP_DIR_ROOT/ssh/
ensureRootDirectory $BACKUP_DIR_ROOT
backupRootDirectory /etc/ssh/ $BACKUP_DIR_ROOT/ssh/
if [[ !(-d $BACKUP_DIR_ROOT/udev/rules.d) ]]; then
mkdir $BACKUP_DIR_ROOT/udev/rules.d
fi
@ -24,6 +24,7 @@ if [[ !(/etc/udev/rules.d/69-hdparm.rules -ef $BACKUP_DIR_ROOT/udev/rules.d/69-h
ln /etc/udev/rules.d/69-hdparm.rules $BACKUP_DIR_ROOT/udev/rules.d/69-hdparm.rules
fi
backupRootDirectory /etc/ssh/ $BACKUP_DIR_ROOT/ssh/
#####################
### upload backup ###

View File

@ -0,0 +1,30 @@
#!/usr/bin/env bash
set -euo pipefail
source /sync/home_external/.bash_aliases
shopt -s expand_aliases # make aliases work
backupRootDirectory() {
ensureRootDirectory $2
sd rsync_backup $1 $2
}
backupDirectory() {
ensureDirectory $2
rsync_backup $1 $2
}
ensureRootDirectory() {
ensureDirectory $1
sudo chown root:root $1
}
ensureDirectory() {
if [[ ! -d $1 ]]; then
mkdir -p $1
fi
}

View File

@ -1,24 +1,27 @@
#!/usr/bin/env bash
set -euo pipefail
source /sync/home_external/.bash_aliases
source /sync/scripts/backup_resources.sh
# FSFIXME expand_aliases still needed?
shopt -s expand_aliases # make aliases work
###############################
### update local backup dir ###
###############################
BACKUP_DIR=/sync/backup
ensureDirectory $BACKUP_DIR
BACKUP_DIR_HOME=$BACKUP_DIR/home
if [[ !($HOME/.bash_aliases_local -ef $BACKUP_DIR_HOME/.bash_aliases_local) ]]; then
ln $HOME/.bash_aliases_local $BACKUP_DIR_HOME/.bash_aliases_local
fi
rsync_backup --link-dest="$HOME/.ssh/" $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/
ensureDirectory $BACKUP_DIR_HOME
backupDirectory $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/
#####################
### upload backup ###
#####################
if [[ "$1" == "--noupload" ]]; then
exit 0;
fi
sd rsync_backup -e "ssh -i /home/fabian/.ssh/id_ed25519" $BACKUP_DIR/ fabian@garrus:/citadel/backup/shepard/