Merge branch 'master' into dataport

Signed-off-by: Michael Grote <michael.grote@posteo.de>

.bash_aliases

@@ -26,7 +26,7 @@ alias glast="git log -1 HEAD --stat"
 alias gd="git difftool"
 alias gsp="git stage -p"
 alias gflog="git log -- "
-alias gb="git branch"
+alias gb="git --no-pager  branch -l"
 # docker
 alias dcu="docker compose up"
 alias dlogs="docker compose logs -f"

.bash_extra

@@ -4,27 +4,35 @@
 unalias ll 2>/dev/null
 
 # source extra files
-source "${HOME}/dotfiles/.bash_aliases"
-source "${HOME}/dotfiles/.bash_functions"
-source "${HOME}/dotfiles/.bash_ps1"
+source "${HOME}/repos/dotfiles/.bash_aliases"
+source "${HOME}/repos/dotfiles/.bash_functions"
+source "${HOME}/repos/dotfiles/.bash_ps1"
 
 ### PATH
 # add my scripts to PATH
-PATH=$PATH:"${HOME}/dotfiles/scripts"
+PATH=$PATH:"${HOME}/repos/dotfiles/scripts"
 
-### tmux auto attach
-# Check if the user ID is not 0 (root)
-if [ "$EUID" -ne 0 ]; then
-  # then auto attach
+## check interactive shell https://unix.stackexchange.com/questions/26676/how-to-check-if-a-shell-is-login-interactive-batch
+if [[ $- == *i* ]] ; then
+  ### root alias
+  alias root='sudo -H -u root /usr/bin/sudo2uls'
+  if [ "$HOSTNAME" = lzeorpt001 ]; then
+    ### git-bash
+    source /usr/share/git-core/contrib/completion/git-prompt.sh
+    ### keychain
+    export GPG_TTY=$(tty)
+    # git commit usw.
+    export EDITOR="/usr/bin/vim"
+  fi
+  ### tmux auto attach
   if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then
     tmux attach -t default || tmux new -s default
   fi
+  if [ "$HOSTNAME" == "lzeorpt001" ] || [ "$HOSTNAME" == "lbdlspa001" ]; then
+    eval $(keychain -q --eval --timeout 60 --agents ssh,gpg)
+  fi
 fi
 
-### keychain
-eval "$(keychain -q --eval --timeout 60 --agents ssh,gpg)"
-export GPG_TTY=$(tty)
-
 ### Praktische Dinge
 # Deaktiviere FlowControl
 # https://unix.stackexchange.com/questions/332791/how-to-permanently-disable-ctrl-s-in-terminal
@@ -51,5 +59,4 @@ export HISTCONTROL=ignoreboth:erasedups
 # typo bei cd entfernen
 shopt -s cdspell
 
-# less mit maus scrollen
-export LESS='--mouse --wheel-lines=3 eFRX'
+export LESS='eFRX'

.bash_functions

@@ -10,7 +10,3 @@ function ssh {
     tmux rename-window "$(hostname -f)"
   fi
 }
-
-function gp {
-  git pull "$@"
-}

.bash_profile

@@ -0,0 +1,8 @@
+# .bash_profile
+
+# Get the aliases and functions
+if [ -f ~/.bashrc ]; then
+        . ~/.bashrc
+fi
+
+# User specific environment and startup programs

.bash_ps1

@@ -8,7 +8,6 @@ BLACK='\[\e[30m\]'
 RESET='\[\e[0m\]'
 ORANGE='\[\e[0;33m\]'
 # git-symbole: * unstaged, + staged, $ stashed, % untracked
-source /usr/lib/git-core/git-sh-prompt
 export GIT_PS1_SHOWUNTRACKEDFILES=1
 export GIT_PS1_SHOWDIRTYSTATE=1
 export GIT_PS1_SHOWSTASHSTATE=1

.bashrc

@@ -0,0 +1 @@
+source ~/repos/dotfiles/.bash_extra

.gitconfig

@@ -1,6 +1,7 @@
 [user]
 name = Michael Grote
-email = michael.grote@posteo.de
+email = michael.grote@dataport.de
+signingkey = 61CCE602D9EC9A33
 [credential]
 helper = store
 [alias]

.ssh/config

@@ -1,47 +1,33 @@
-### ssh-agent
+StrictHostKeyChecking no
 IgnoreUnknown UseKeychain
 UseKeychain yes
 AddKeysToAgent yes
+LogLevel ERROR
+SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL
 
-### keys
-StrictHostKeyChecking=accept-new
-# https://stackoverflow.com/questions/21383806/how-can-i-force-ssh-to-accept-a-new-host-fingerprint-from-the-command-line
+Host l*.mgmt.dpaor.org l*.landsh.de l*.stadt.hamburg.de l*.hb-netz.de l*.lsa-net.de 10.62.*
+  User grotemi-admin@mgmt.dpaor.org
 
-### mgrote.net
-Host fileserver3.mgrote.net
-Host docker10.mgrote.net
-Host pve5.mgrote.net
-Host forgejo.mgrote.net
-Host ldap.mgrote.net
-Host pve5-test.mgrote.net
-Host vm-test-2404.mgrote.net
-Host pbs-test.mgrote.net
-Host pbs.mgrote.net
-Host munin.mgrote.net
-Host blocky.mgrote.net
-Host *.mgrote.net
-	IdentityFile ~/.ssh/mgrote.net
+Host *.dpaor.net *.dpaorinp.de 10.61.* 10.65.*
+  User grotemi-admin@dpaor.net
 
-### Ubiquity
-Host nanohd-wohnzimmer.mgrote.net
-	User ubi_ssh_admin
-	HostKeyAlgorithms=+ssh-dss
+Host git.dataport.de
+  HostName git.dataport.de
+  User git
+  PreferredAuthentications publickey
+  Port 2200
+  IdentityFile ~/.ssh/zcdi-gitlab
 
-### Mikrotik
-Host rb5009.mgrote.net crs305.mgrote.net hex.mgrote.net
-	User admin
-	IdentityFile ~/.ssh/mikrotik_ed25519
+Host gitlab.dataport.de
+  Hostname gitlab.dataport.de
+  User git
+  PreferredAuthentications publickey
+  IdentityFile ~/.ssh/adminptf-gitlab
+  AddKeysToAgent yes
 
-### papa.lan
-Host qnap-nas
-	HostName 192.168.3.108
-	User extraadmin
-	IdentityFile ~/.ssh/qnap_papa
+Host gitlab.cicd.apps.okd001.mcmp-stage.dsc.dataport.de
+  User git
+  PreferredAuthentications publickey
+  IdentityFile ~/.ssh/rz40_gitlab
+  AddKeysToAgent yes
 
-### ssh-key für git clone
-Host git.mgrote.net
-	IdentityFile ~/.ssh/git.mgrote.net
-
-Host github.com
-	User git
-	IdentityFile ~/.ssh/github.com

.vimrc

@@ -255,7 +255,11 @@ endif
 augroup spell
   autocmd!
   autocmd FileType * highlight SpellBad cterm=underline ctermfg=red ctermbg=NONE
-  autocmd FileType * set spellfile=~/dotfiles/vim/spell/own.add
+  if $HOSTNAME == "lbdlspa001"
+        autocmd FileType * set spellfile=~/repos/dotfiles/vim/spell/own.add
+  elseif $HOSTNAME == "lzeorpt001"
+        autocmd FileType * set spellfile=/homes/MGMT/grotemi-admin/repos/dotfiles/vim/spell/own.add
+  endif
   autocmd FileType * set spellsuggest=fast,10
   autocmd FileType * set spell spelllang=de_de,en
 augroup END

scripts/git_pull

@@ -0,0 +1,9 @@
+#!/bin/bash
+if [ -n "${TMUX}" ]; then
+  remotename=$(git remote -v | cut -f2 -d"@" | cut -f1 -d":" | head -n1)
+  tmux rename-window "SSH: $remotename"
+fi
+git pull
+if [ -n "${TMUX}" ]; then
+  tmux rename-window "$(basename $(pwd))"
+fi

scripts/gp

@@ -0,0 +1 @@
+git_pull

scripts/sync_dotfiles_dp.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+if [ "$HOSTNAME" = lbdlspa001 ]; then
+    rsync -av --delete -e ssh /home/.autofs/lunixpf001/home-linux/grotemi-admin/repos/ lzeorpt001.mgmt.dpaor.org:/homes/MGMT/grotemi-admin/repos
+fi

vim/spell/own.add

@@ -1,2 +1,298 @@
 dotfiles
 Ansible
+LVM
+PV
+LV
+YAML
+Orchestrierungs
+Konfigmanagementools
+Patchmanagement
+TDC
+Konfigmanagment
+Ausbildungscloud
+TOML
+yaml
+lvm
+ansible
+Shellcheck
+committen
+gitlab
+dataport
+linux
+Gruppenkeepass
+ARTIFACTORY
+Tokenname
+Paketrepository
+Installierbarkeit
+Skripte
+Artifactory
+Paketrepo
+config
+forken
+PRs
+ci
+Baseimage
+buildcontainer
+yml
+Hauptbranch
+shellcheck
+gitleaks
+StackOverflow
+yamllint
+gepushed
+tl
+dr
+Monorepository
+Grote
+Paketrepos
+comitted
+gemerged
+Mitgeltende
+Protokollierungskonzeptes
+fachbereichsbezogenen
+BHB
+BD
+Basisinfrastrukturdienst
+Multiverfahrensdienst
+MVD
+RZ
+Protokollierungskonzept
+Mandantenkonzept
+TST
+LDN
+zzeor
+d001
+PSQL
+TZ4
+RHEL9
+QS
+awx
+keycloak
+RDP
+Kubernetes
+Webhook
+FluxCD
+Quellrepository
+OCI
+Containerregistry
+SHA256
+Checksummen
+SSO
+ZEOR
+Loadbalancer
+Fileservice
+artifactory
+CMDB
+OCP
+Releasemanagementkonzept
+Patchmanagementkonzept
+lzeor
+Patchfenster
+zLinux
+Postgres
+gepatcht
+Notfallvorsorgemanagement
+Multiverfahrensdienste
+OpenShift
+RedHat
+NTP
+PTR
+FQDN
+Infoblox
+WinRM
+ALG
+ESXi
+ServiceCMBD
+MGMT
+SLA
+BSI
+Notfallhandbücher
+checkMK
+S3
+etcd
+zcdi
+CONFIGFILE
+shyaml
+xargs
+amd64
+fi
+podman
+Herstellerrepositories
+Multiline
+debian12
+ubuntu20
+ubuntu22
+rhel7
+rhel8
+rhel9
+sles12
+sles15
+dists
+Configdatei
+baseimages
+microdnf
+ubi7
+ubi8
+ubi9
+dnf
+txt
+tmp
+mv
+fpm
+SHA
+env
+EOF
+dpkg
+usr
+opensuse
+zypper
+test
+RHEL
+SLES
+reddit
+localhost
+hostname
+Tanium
+shawn
+huebner
+hostvars
+tanium
+Hospitationsanfragen
+Timeboxing
+Ditmar
+FVM
+JIRA
+TQ
+grundschutzkonform
+dSecurecloud
+Präsenzrunde
+Postinstall
+Releasekonzept
+Ressourcelimits
+OOM
+KIMs
+zzeorqd001
+zzeorpd001
+AAP
+TODO
+ServiceCMDB
+Fur/!
+EE
+ee
+zeor
+Patchlaufs
+Paketrepositories
+md
+Replikationsdatenbank
+vorgefiltert
+#in
+ein/!
+ein
+Shortnames
+Datacenter
+apiVersion
+nfs
+subdir
+argocd
+argoproj
+enableAutoSync
+#eyCloak
+ArgoCD
+KeyCloak/!
+FFMPEG
+grotemi
+lbdlspa001
+mgmt
+dpaor
+ctrl
+#uestion
+quote
+tmux
+Workaround/!
+Workaround
+TVM
+DCS
+TZ
+PoC
+CoreOS
+Konfigurationsmgmt
+IPv6
+HANA
+KRB
+SMB
+Hiera
+Puppetversion
+SuMa
+GSC
+sysctl
+Cloudera
+Feldhoff
+Entwicklungssharepoint
+vllt
+rsync
+chown
+chmod
+ed25519
+scp
+sudo
+systemctl
+sshd
+X11
+buildah
+zentro
+python3
+pip3
+releasever
+basearch
+fedoraepel
+EPEL
+nodejs
+baseurl
+gpgcheck
+gpgkey
+lzeorpt001
+noqa
+k8s
+mkdir
+cp
+ln
+kommandozeilentools1
+url
+github
+SLB
+hostet
+heredoc
+#uestion
+question/!
+question
+#TDOUT
+Kommandozeilentools/!
+STDOUT/!
+#ur/!
+fur/!
+eingegebende
+bashrc
+sourcen
+Sharepoint
+GitLab
+Anderungen/!
+#rstmal
+#rstmal/!
+#rstmal
+postinstall
+Systeminfrastrukturdiagramm
+Dederke
+Mezger
+SLES12
+#rstmal
+#rstmal
+erstmal/!
+erstmal
+PaaS
+CMP
+SelfService
+MarkDown
+RHEL7
+VFAT
+HW
+FHHNET