From 4438a2cfa7c0cf60fe81a846993b6e46b6b9e383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 17 Jun 2022 15:07:03 +0200 Subject: [PATCH 1/8] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/nerdtree | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 3b7a962..7052987 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 3b7a962dc6db227d18faecb25c793431ce7e8640 +Subproject commit 70529878e20cf0367ca25b0aa9dbf1f51062f5e0 diff --git a/vim/pack/plugins/start/nerdtree b/vim/pack/plugins/start/nerdtree index eed488b..fc85a6f 160000 --- a/vim/pack/plugins/start/nerdtree +++ b/vim/pack/plugins/start/nerdtree @@ -1 +1 @@ -Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424 +Subproject commit fc85a6f07c2cd694be93496ffad75be126240068 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 5d7e656..97a9aa4 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 5d7e6560817138110abec3e5c9903b408bc21f51 +Subproject commit 97a9aa4bdb24eea5e85ac0015bdd570f42bad6e7 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 92870eb..9fadd7a 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 92870eb6d2f9663f34f20537ef0393b5ffeb2291 +Subproject commit 9fadd7a7780f38d1b8666d5b5f497fbcd46952eb From b4eb14cf17ccf4ceaa38934d21e17dc50929dc99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sun, 26 Jun 2022 23:42:03 +0200 Subject: [PATCH 2/8] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 7052987..2707af4 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 70529878e20cf0367ca25b0aa9dbf1f51062f5e0 +Subproject commit 2707af403a106ddf864d9c2bae2c5e2f9b07b05f diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 9fadd7a..36b80c1 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 9fadd7a7780f38d1b8666d5b5f497fbcd46952eb +Subproject commit 36b80c190c3bf8b502867c6a8bec6de295791b49 From 44d671e5a36206cab892333a5e3d5b0f5bc45f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 27 Jun 2022 02:39:41 +0200 Subject: [PATCH 3/8] reduce ssh-commands for sshs to 2 --- functions.sh | 2 +- sshs | 76 +++++++++++++++++++--------------------------------- 2 files changed, 28 insertions(+), 50 deletions(-) diff --git a/functions.sh b/functions.sh index 428d537..89cb6da 100755 --- a/functions.sh +++ b/functions.sh @@ -509,7 +509,7 @@ EOF [ -e ${MSC_BASE}/sshs ] && source ${MSC_BASE}/sshs -VIMRC="${MSC_BASE}/vimrc" +[ -z ${VIMRC+x} ] &&VIMRC="${MSC_BASE}/vimrc" svi () { ENTRY diff --git a/sshs b/sshs index a7d21e4..9c0264b 100644 --- a/sshs +++ b/sshs @@ -36,6 +36,14 @@ export SCRIPT_LOG="\$(cat /proc/\$$/cmdline | xargs -0 echo|awk '{print \$3}' |s export LOGLEVEL_DEFAULT="${LOGLEVEL_DEFAULT}" export FILELOGLEVEL_DEFAULT="${FILELOGLEVEL_DEFAULT}" +trap "rm -f \${bashrctmp} \${vimrctmp} \${SCRIPT_LOG}" EXIT +alias vi='vim -u \${vimrctmp}' +alias vim='vim -u \${vimrctmp}' +alias vimdiff='vimdiff -u \${vimrctmp}' +export LS_OPTIONS="${LS_OPTIONS}" +export VIMRC="\${vimrctmp}" +export BASHRC="\${bashrctmp}" + for i in /etc/profile.d/*.sh; do if [ -r "$i" ];then if [ "$PS1" ]; then @@ -61,61 +69,31 @@ EOF logdebug "SSH_OPTS: $SSH_OPTS" local sshcmd=$(cat << _remote_commands -mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf | tr -d '[:space:]' -echo " " -mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf | tr -d '[:space:]' -echo " " -_remote_commands -) - local REMOTETMPCONFIGS=($(ssh -T ${SSH_OPTS} $@ "$sshcmd") ) -# local REMOTETMPCONFIGS=($(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf" | tr -d '[:space:]' ) $(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf" | tr -d '[:space:]' )) - logdebug remote tmp bashrc ${REMOTETMPCONFIGS[0]} - logdebug remote tmp vimrc ${REMOTETMPCONFIGS[1]} - #local REMOTETMPBASHCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf" | tr -d '[:space:]' ) - #logdebug "REMOTETMPBASHCONFIG: $REMOTETMPBASHCONFIG" -# logdebug $(ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}") -# logdebug $(ssh -T ${SSH_OPTS} $@ "hostnamectl") - #logdebug "create remote vimrc" - #local REMOTETMPVIMCONFIG=$(ssh -T ${SSH_OPTS} $@ "mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf" | tr -d '[:space:]' ) - #logdebug "REMOTETMPVIMCONFIG: $REMOTETMPVIMCONFIG" +#!/bin/bash +bashrctmp=\$(mktemp -p \${XDG_RUNTIME_DIR-~} -t bashrc.XXXXXXXX --suffix=.conf | tr -d '[:space:]') +vimrctmp=\$(mktemp -p \${XDG_RUNTIME_DIR-~} -t vimrc.XXXXXXXX --suffix=.conf | tr -d '[:space:]') +echo "\$bashrctmp \$vimrctmp" - # Add additional aliases to bashrc for remote-machine - cat << EOF >> "${TMPBASHCONFIG}" -alias vi='vim -u ${REMOTETMPCONFIGS[1]}' -alias vim='vim -u ${REMOTETMPCONFIGS[1]}' -alias vimdiff='vimdiff -u ${REMOTETMPCONFIGS[1]}' -export LS_OPTIONS="${LS_OPTIONS}" -export VIMRC="${REMOTETMPCONFIGS[1]}" -export BASHRC="${REMOTETMPCONFIGS[0]}" +echo "bashrctmp=\${bashrctmp}" > \${bashrctmp} +echo "vimrctmp=\${vimrctmp}" >> \${bashrctmp} + +cat <<- 'eof' >> \$bashrctmp +$(cat ${TMPBASHCONFIG}) title "\$USER@\$HOSTNAME: \$PWD" loginfo "This bash runs with temporary config from \$BASHRC" -EOF +eof - logdebug "create fill remote bashrc" - -ssh -T ${SSH_OPTs} $@ << _remote_cmd -cat <<- 'eof2' > ${REMOTETMPCONFIGS[0]} -$(cat ${TMPBASHCONFIG}) -eof2 -cat <<- 'eof3' > ${REMOTETMPCONFIGS[1]} +cat <<- 'eof3' > \${vimrctmp} $(cat ${MSC_BASE}/vimrc) eof3 -_remote_cmd -#echo BLA3 - #ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPBASHCONFIG}" < "${TMPBASHCONFIG}" - #ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPCONFIGS[0]}" < "${TMPBASHCONFIG}" - # logtrace $(ssh -T ${SSH_OPTS} $@ "stat ${REMOTETMPBASHCONFIG}") - logdebug "create file remote vimrc" - #ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPVIMCONFIG}" < "${MSC_BASE}/vimrc" - #ssh -T ${SSH_OPTS} $@ "cat > ${REMOTETMPCONFIGS[1]}" < "${MSC_BASE}/vimrc" - #local RCMD="/bin/bash --noprofile --norc -c " - RCMD=" - trap \"rm -f ${REMOTETMPCONFIGS[0]} ${REMOTETMPCONFIGS[1]} ${SCRIPT_LOG}\" EXIT" -# logdebug "run remote shell with temporary config" -# #ssh -t ${SSH_OPTS} $@ "$RCMD; SSHS=true bash -c \"function bash () { /bin/bash --rcfile ${REMOTETMPBASHCONFIG} -i ; } ; export -f bash; exec bash --rcfile ${REMOTETMPBASHCONFIG}\"" -# #ssh -t ${SSH_OPTS} $@ "$RCMD; SSHS=true bash --noprofile --norc -c \"function bash () { /bin/bash --rcfile ${REMOTETMPCONFIGS[0]} -i ; } ; export -f bash; exec bash --rcfile ${REMOTETMPCONFIGS[0]}\"" - ssh -t ${SSH_OPTS} $@ "$RCMD; SSHS=true exec bash --rcfile ${REMOTETMPCONFIGS[0]} -i " - rm "${TMPBASHCONFIG}" +_remote_commands +) + + local REMOTETMPCONFIGS=($(ssh -T ${SSH_OPTS} $@ "$sshcmd") ) + logdebug remote tmp bashrc ${REMOTETMPCONFIGS[0]} + logdebug remote tmp vimrc ${REMOTETMPCONFIGS[1]} + ssh -t ${SSH_OPTS} $@ "SSHS=true exec bash --rcfile ${REMOTETMPCONFIGS[0]} -i " + rm "${TMPBASHCONFIG}" else logwarn "${TMPBASHCONFIG} does not exist. Using »ssh -t $@«" ssh -t "$@" From 62d46e748476fda6e1b70bad1f667a7a4d8378ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 15 Jun 2022 13:17:40 +0200 Subject: [PATCH 4/8] update submodules --- tmux/plugins/tmux-sensible | 2 +- tmux/plugins/tmux-themepack | 2 +- vim/pack/color/start/Zenburn | 2 +- vim/pack/plugins/start/SimpylFold | 2 +- vim/pack/plugins/start/ctrlp.vim | 2 +- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/fzf.vim | 2 +- vim/pack/plugins/start/syntastic | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-bracketed-paste | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- vim/pack/plugins/start/vim-gitgutter | 2 +- vim/pack/plugins/start/vim-gnupg | 2 +- vim/pack/plugins/start/vim-nerdtree-tabs | 2 +- vim/pack/syntax/start/indentpython.vim | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tmux/plugins/tmux-sensible b/tmux/plugins/tmux-sensible index e91b178..5d089e4 160000 --- a/tmux/plugins/tmux-sensible +++ b/tmux/plugins/tmux-sensible @@ -1 +1 @@ -Subproject commit e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5 +Subproject commit 5d089e418efb1a00f47654014ed085deb3d0c878 diff --git a/tmux/plugins/tmux-themepack b/tmux/plugins/tmux-themepack index 1b1b809..7c59902 160000 --- a/tmux/plugins/tmux-themepack +++ b/tmux/plugins/tmux-themepack @@ -1 +1 @@ -Subproject commit 1b1b8098419daacb92ca401ad6ee0ca6894a40ca +Subproject commit 7c59902f64dcd7ea356e891274b21144d1ea5948 diff --git a/vim/pack/color/start/Zenburn b/vim/pack/color/start/Zenburn index 33e67af..bdd9f58 160000 --- a/vim/pack/color/start/Zenburn +++ b/vim/pack/color/start/Zenburn @@ -1 +1 @@ -Subproject commit 33e67af2418e4775c2a7abc6e8fef401e697e1eb +Subproject commit bdd9f58b969b153a586d22435c987a846da2922b diff --git a/vim/pack/plugins/start/SimpylFold b/vim/pack/plugins/start/SimpylFold index ff4c851..b4a87e5 160000 --- a/vim/pack/plugins/start/SimpylFold +++ b/vim/pack/plugins/start/SimpylFold @@ -1 +1 @@ -Subproject commit ff4c85197c5555715093c08a8d4f9d493c4d80cd +Subproject commit b4a87e509c3d873238a39d1c85d0b97d6819f283 diff --git a/vim/pack/plugins/start/ctrlp.vim b/vim/pack/plugins/start/ctrlp.vim index 3ce448c..d5b0920 160000 --- a/vim/pack/plugins/start/ctrlp.vim +++ b/vim/pack/plugins/start/ctrlp.vim @@ -1 +1 @@ -Subproject commit 3ce448c9687ae96dea0caf4da388ecd8d9072f72 +Subproject commit d5b092036bc651912474f64277913be8502f8f09 diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 2707af4..a06671b 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 2707af403a106ddf864d9c2bae2c5e2f9b07b05f +Subproject commit a06671b47f0284733c7edf7dae8f22f9758c8393 diff --git a/vim/pack/plugins/start/fzf.vim b/vim/pack/plugins/start/fzf.vim index d5f1f86..b23e4bb 160000 --- a/vim/pack/plugins/start/fzf.vim +++ b/vim/pack/plugins/start/fzf.vim @@ -1 +1 @@ -Subproject commit d5f1f8641b24c0fd5b10a299824362a2a1b20ae0 +Subproject commit b23e4bb8f853cb9641a609c5c8545751276958b0 diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic index b7f4f71..2c4b33f 160000 --- a/vim/pack/plugins/start/syntastic +++ b/vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit b7f4f71539038d33f173bfa72631737da049575a +Subproject commit 2c4b33f6e6679fb5f3824d9cd38d4813c71a19a3 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 97a9aa4..e2498d7 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 97a9aa4bdb24eea5e85ac0015bdd570f42bad6e7 +Subproject commit e2498d72dcc123115ed1d0fe1449beba6dadecc2 diff --git a/vim/pack/plugins/start/vim-bracketed-paste b/vim/pack/plugins/start/vim-bracketed-paste index 45411da..1b32008 160000 --- a/vim/pack/plugins/start/vim-bracketed-paste +++ b/vim/pack/plugins/start/vim-bracketed-paste @@ -1 +1 @@ -Subproject commit 45411da73cc159e4fc2138d930553d247bbfbcdc +Subproject commit 1b320083dc0892b8a874a17c75abfea86c801434 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 36b80c1..46652a3 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 36b80c190c3bf8b502867c6a8bec6de295791b49 +Subproject commit 46652a304f0b89f36d70cee954d77e467ec0f6de diff --git a/vim/pack/plugins/start/vim-gitgutter b/vim/pack/plugins/start/vim-gitgutter index ded1194..18d1298 160000 --- a/vim/pack/plugins/start/vim-gitgutter +++ b/vim/pack/plugins/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit ded11946c04aeab5526f869174044019ae9e3c32 +Subproject commit 18d12985ea6cb7ede59755ff4fd0a9fa1e6bf835 diff --git a/vim/pack/plugins/start/vim-gnupg b/vim/pack/plugins/start/vim-gnupg index f9b608f..96be0be 160000 --- a/vim/pack/plugins/start/vim-gnupg +++ b/vim/pack/plugins/start/vim-gnupg @@ -1 +1 @@ -Subproject commit f9b608f29003dfde6450931dc0f495a912973a88 +Subproject commit 96be0be1240a848da56d665b38e1b0fe7ee3f1af diff --git a/vim/pack/plugins/start/vim-nerdtree-tabs b/vim/pack/plugins/start/vim-nerdtree-tabs index 07d19f0..8eadb5b 160000 --- a/vim/pack/plugins/start/vim-nerdtree-tabs +++ b/vim/pack/plugins/start/vim-nerdtree-tabs @@ -1 +1 @@ -Subproject commit 07d19f0299762669c6f93fbadb8249da6ba9de62 +Subproject commit 8eadb5bd8fead8594d201f7cd78aed912243fd9f diff --git a/vim/pack/syntax/start/indentpython.vim b/vim/pack/syntax/start/indentpython.vim index 6aaddfd..3c6d80f 160000 --- a/vim/pack/syntax/start/indentpython.vim +++ b/vim/pack/syntax/start/indentpython.vim @@ -1 +1 @@ -Subproject commit 6aaddfde21fe9e7acbe448b92b3cbb67f2fe1fc1 +Subproject commit 3c6d80fc59d57ed2fbef14333c0efef02cbcf2f8 From 23c9950215130fe6bee82b3bfae078e688f70dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 15 Jun 2022 15:18:22 +0200 Subject: [PATCH 5/8] add script to en/disable servers from loadbalancers --- bin/haproxy-maintenance | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100755 bin/haproxy-maintenance diff --git a/bin/haproxy-maintenance b/bin/haproxy-maintenance new file mode 100755 index 0000000..2759e77 --- /dev/null +++ b/bin/haproxy-maintenance @@ -0,0 +1,59 @@ +#!/bin/bash + +function help() { +cat << EOF + + Usage: $(basename $0) + + [enable|disable|help] + Nomenklatur ist + [jra|cnf] 3 characters + [0-9] 1 character + [pte] 1 character + [0-9] 1 character +EOF +} + +case $1 in + enable) + ACTION=enable + ;; + disable) + ACTION=disable + ;; + help) + help + exit 0 + ;; + *) + help + exit 1 + ;; +esac +shift + +UMG=${1:4:1} +CLUSTER=${1:0:4} +NODE=${1:5:1} +LBS=( atlb${UMG}1 atlb${UMG}2 ) +BACKENDS=( ${CLUSTER} ${CLUSTER}_direct ) +SERVERS=( ${CLUSTER}${NODE} ${CLUSTER}${NODE}d ) +HAADMINSOCK=/run/haproxy/admin.sock + +i=0 +while [ $i -lt ${#BACKENDS[@]} ];do + +cat << EOF + Action: $ACTION + Umgebung: $UMG + Cluster: $CLUSTER + Node: $NODE + Loadbalancers: ${LBS[*]} + Backend: ${BACKENDS[$i]} + Server: ${SERVERS[$i]} + ------------------------------------ + +EOF +parallel-ssh -i $(for l in ${LBS[@]};do echo -H $l;done) "echo '$ACTION server ${BACKENDS[$i]}/${SERVERS[$i]}'|socat stdio $HAADMINSOCK" +i=$((i+1)) +done From 6c8afa408d5878b66f3d7d928efadea84185b830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Mon, 4 Jul 2022 15:27:49 +0200 Subject: [PATCH 6/8] read cnf/jra xml with xmllint --- functions.sh | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/functions.sh b/functions.sh index 89cb6da..9fd2f8e 100755 --- a/functions.sh +++ b/functions.sh @@ -1121,9 +1121,12 @@ function getdbcreds_jra () { ;; esac - DB_URL="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" - DB_USER="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" - DB_PWD="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + #DB_URL="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + #DB_USER="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + #DB_PWD="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + DB_URL="$(xmllint --xpath "jira-database-config/jdbc-datasource/url/text()" ${DB_FILE})" + DB_USER="$(xmllint --xpath "jira-database-config/jdbc-datasource/username/text()" ${DB_FILE})" + DB_PWD="$(xmllint --xpath "jira-database-config/jdbc-datasource/password/text()" ${DB_FILE})" DB_HOST="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\1@')" DB_PORT="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\2@')" DB_NAME="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\3@')" @@ -1147,9 +1150,12 @@ function getdbcreds_cnf () { ;; esac - DB_URL="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" - DB_USER="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" - DB_PWD="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" +# DB_URL="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" +# DB_USER="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" +# DB_PWD="$(grep -oPm1 "(?<=)[^<]+" ${DB_FILE})" + DB_URL="$(xmllint --xpath "confluence-configuration/properties/property[@name='hibernate.connection.url']/text()" ${DB_FILE})" + DB_USER="$(xmllint --xpath "confluence-configuration/properties/property[@name='hibernate.connection.username']/text()" ${DB_FILE})" + DB_PWD="$(xmllint --xpath "confluence-configuration/properties/property[@name='hibernate.connection.password']/text()" ${DB_FILE})" DB_HOST="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\1@')" DB_PORT="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\2@')" DB_NAME="$(echo $DB_URL|sed 's@^.*//@@;s@\(^.*\):\(.*\)/\(.*\)$@\3@')" @@ -1206,4 +1212,15 @@ urldecode() { findlocallogins() { last -F -a $(for i in $(find /var/log -maxdepth 1 -name "wtmp*"|sort -h);do echo -n "-f $i ";done)|grep -v "pts/\|reboot\|wtmp"|awk '{print $4,$5,$7}'|uniq } + +gojrahome() { + local APP_INST=/opt/atlassian/jira + cd $(awk -F "=" '/jira.home/ {gsub(/ /, "", $0); print $2}' "${APP_INST}/atlassian-jira/WEB-INF/classes/jira-application.properties") +} + +gojrashome() { + local APP_INST=/opt/atlassian/jira + local JIRA_HOME=$(awk -F "=" '/jira.home/ {gsub(/ /, "", $0); print $2}' "${APP_INST}/atlassian-jira/WEB-INF/classes/jira-application.properties") + [ -e "${JIRA_HOME}/cluster.properties" ] && cd $(awk -F "=" '/jira.shared.home/ {gsub(/ /, "", $0); print $2}' "${JIRA_HOME}/cluster.properties") || echo no shared home configured >&2 +} #EOF From 571b99457d6fa971fa18d3479d9bc3e2a04b5728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Fri, 17 Jun 2022 15:07:03 +0200 Subject: [PATCH 7/8] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index a06671b..7052987 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit a06671b47f0284733c7edf7dae8f22f9758c8393 +Subproject commit 70529878e20cf0367ca25b0aa9dbf1f51062f5e0 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index e2498d7..97a9aa4 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit e2498d72dcc123115ed1d0fe1449beba6dadecc2 +Subproject commit 97a9aa4bdb24eea5e85ac0015bdd570f42bad6e7 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 46652a3..9fadd7a 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 46652a304f0b89f36d70cee954d77e467ec0f6de +Subproject commit 9fadd7a7780f38d1b8666d5b5f497fbcd46952eb From ec99f40ff41338646804e8b105b1d4ad7799a6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Wed, 15 Jun 2022 13:17:40 +0200 Subject: [PATCH 8/8] update submodules --- vim/pack/plugins/start/fzf | 2 +- vim/pack/plugins/start/vim-airline | 2 +- vim/pack/plugins/start/vim-fugitive | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/pack/plugins/start/fzf b/vim/pack/plugins/start/fzf index 7052987..a06671b 160000 --- a/vim/pack/plugins/start/fzf +++ b/vim/pack/plugins/start/fzf @@ -1 +1 @@ -Subproject commit 70529878e20cf0367ca25b0aa9dbf1f51062f5e0 +Subproject commit a06671b47f0284733c7edf7dae8f22f9758c8393 diff --git a/vim/pack/plugins/start/vim-airline b/vim/pack/plugins/start/vim-airline index 97a9aa4..e2498d7 160000 --- a/vim/pack/plugins/start/vim-airline +++ b/vim/pack/plugins/start/vim-airline @@ -1 +1 @@ -Subproject commit 97a9aa4bdb24eea5e85ac0015bdd570f42bad6e7 +Subproject commit e2498d72dcc123115ed1d0fe1449beba6dadecc2 diff --git a/vim/pack/plugins/start/vim-fugitive b/vim/pack/plugins/start/vim-fugitive index 9fadd7a..46652a3 160000 --- a/vim/pack/plugins/start/vim-fugitive +++ b/vim/pack/plugins/start/vim-fugitive @@ -1 +1 @@ -Subproject commit 9fadd7a7780f38d1b8666d5b5f497fbcd46952eb +Subproject commit 46652a304f0b89f36d70cee954d77e467ec0f6de