diff --git a/dots/archinstall/t470p/options.sh b/dots/archinstall/t470p/options.sh old mode 100644 new mode 100755 diff --git a/dots/archinstall/tuxwarrior/options.sh b/dots/archinstall/tuxwarrior/options.sh old mode 100644 new mode 100755 diff --git a/dots/bash/.bashrc b/dots/bash/.bashrc index 71beacd..95bed38 100644 --- a/dots/bash/.bashrc +++ b/dots/bash/.bashrc @@ -57,8 +57,8 @@ alias quantumfix="pw-metadata -n settings 0 clock.force-quantum 1024" alias sb="source ~/.bashrc" alias sbr="source /home/poq/syncDir/gitRepos/gi.op.fo/lnx-arch/dots/bash/.bashrc" # source bash (from) repo alias sizeInBytes="stat -c %s" -alias ssh_weba_r="ssh -t root@178.156.192.201 -p 1808 'export TERM=xterm; cd /tmp; bash -l'" -alias ssh_weba_u="ssh -t usr@178.156.192.201 -p 1808 'export TERM=xterm; cd /tmp; bash -l'" +alias ssh_weba_r="ssh -t root@weba -p 1808 'export TERM=xterm; cd /tmp; bash -l'" +alias ssh_weba_u="ssh -t usr@weba -p 1808 'export TERM=xterm; cd /tmp; bash -l'" alias starwars="telnet towel.blinkenlights.nl" alias tp-empty="trash-empty" alias tp-list="tree ~/.local/share/Trash/" @@ -66,7 +66,7 @@ alias tp-restore="trash-restore" alias tp="tp.sh" alias tree="tree --du -h" alias unimatrix="unimatrix.py" # terminal idle "screensaver" -alias weba-connect="ssh -t root@178.156.192.201 -p 1808 'export TERM=xterm; cd /tmp; bash -l'" +#alias weba-connect="ssh -t root@178.156.192.201 -p 1808 'export TERM=xterm; cd /tmp; bash -l'" # app images #alias dbgate="/home/poq/syncDir/quick/swas/installationFiles/dbGate/dbgate-latest.AppImage" diff --git a/dots/bin/auto_startup.sh b/dots/bin/auto_startup.sh old mode 100644 new mode 100755 diff --git a/dots/bin/azurevpnclient_GLib-GIO-CRITICAL_fix.sh b/dots/bin/azurevpnclient_GLib-GIO-CRITICAL_fix.sh old mode 100644 new mode 100755 diff --git a/dots/bin/chmodAllSh.sh b/dots/bin/chmodAllSh.sh old mode 100644 new mode 100755 diff --git a/dots/bin/deploySshKeys.sh b/dots/bin/deploySshKeys.sh old mode 100644 new mode 100755 index ec8fd8a..5ef7654 --- a/dots/bin/deploySshKeys.sh +++ b/dots/bin/deploySshKeys.sh @@ -22,32 +22,45 @@ if ! [[ -d "$trg_ssh_dir" ]]; then mkdir -p ${trg_ssh_dir} fi -if ! [[ -f ${trg_ssh_dir}/*.pub ]]; then - echo "deploy id_rsa.pub" - cp ${src_ssh_dir}/*.pub ${trg_ssh_dir} -else +files=$(shopt -s nullglob dotglob; echo ${trg_ssh_dir}/*.pub) +if (( ${#files} )) +then echo "*.pub already exist in ${trg_ssh_dir}" +else + echo "deploy .pub file" + cp ${src_ssh_dir}/*.pub ${trg_ssh_dir} fi -# if ! [[ -f ${trg_ssh_dir}/id_rsa.gpg ]]; then -# echo "deploy id_rsa.gpg" -# cp ${src_ssh_dir}/id_rsa.gpg ${trg_ssh_dir} -# else -# echo "id_rsa.gpg already exist in ${trg_ssh_dir}" -# fi -# -# echo "do you want to decrypt id_rsa.gpg? (y/n)" -# read user_input -# -# if [[ ${user_input} == "y" ]]; then -# echo "yes" -# echo "please, remember the hint: poq.l2" -# gpg -d ${trg_ssh_dir}/id_rsa.gpg > ${trg_ssh_dir}/id_rsa -# chmod 0600 ${trg_ssh_dir}/id_rsa # id_rsa can not be accessible by other users -# else -# echo "no worries. you can manually decrypt the file, if needed:" -# echo "gpg -d id_rsa.gpg > id_rsa" -# fi -# +files=$(shopt -s nullglob dotglob; echo ${trg_ssh_dir}/*.gpg) +if (( ${#files} )) +then + echo "*.gpg already exist in ${trg_ssh_dir}" +else + echo "deploy .gpg file" + cp ${src_ssh_dir}/*.gpg ${trg_ssh_dir} +fi + +echo "do you want to decrypt *.gpg? (y/n)" +read user_input + +if [[ ${user_input} == "y" ]]; then + echo "yes" + echo "please, remember the hint: poq.l2" + + for file in ${src_ssh_dir}/*.gpg; do + echo "processing '$file'" + + filename="${file##*/}" # get basename + filename="${filename%.*}" # remove extension + + gpg -d ${trg_ssh_dir}/${filename}.gpg > ${trg_ssh_dir}/${filename} + chmod 0600 ${trg_ssh_dir}/${filename} # id_rsa can not be accessible by other users + done + + else + echo "no worries. you can manually decrypt the file, if needed. example command:" + echo "gpg -d id_rsa.gpg > id_rsa" + fi + echo "${trg_ssh_dir}:" ls -al ${trg_ssh_dir} diff --git a/dots/bin/dragin.sh b/dots/bin/dragin.sh old mode 100644 new mode 100755 diff --git a/dots/bin/extract.sh b/dots/bin/extract.sh old mode 100644 new mode 100755 diff --git a/dots/bin/figlets.sh b/dots/bin/figlets.sh old mode 100644 new mode 100755 diff --git a/dots/bin/gitReposSoftlinker.sh b/dots/bin/gitReposSoftlinker.sh old mode 100644 new mode 100755 diff --git a/dots/bin/importGnupgKeys.sh b/dots/bin/importGnupgKeys.sh old mode 100644 new mode 100755 diff --git a/dots/bin/obsolete/obsolete.i3lock_fk.sh b/dots/bin/obsolete/obsolete.i3lock_fk.sh old mode 100644 new mode 100755 diff --git a/dots/bin/obsolete/obsolete.lfMultiSelectHandler.sh b/dots/bin/obsolete/obsolete.lfMultiSelectHandler.sh old mode 100644 new mode 100755 diff --git a/dots/bin/obsolete/obsolete.lordOfTheRing.sh b/dots/bin/obsolete/obsolete.lordOfTheRing.sh old mode 100644 new mode 100755 diff --git a/dots/bin/obsolete/obsolete.mountDownloadsDir.sh b/dots/bin/obsolete/obsolete.mountDownloadsDir.sh old mode 100644 new mode 100755 diff --git a/dots/bin/obsolete/obsolete.pCloudSynologyDriveRestarter.sh b/dots/bin/obsolete/obsolete.pCloudSynologyDriveRestarter.sh old mode 100644 new mode 100755 diff --git a/dots/bin/obsolete/obsolete.quick_pgDatadirChownSwitch.sh b/dots/bin/obsolete/obsolete.quick_pgDatadirChownSwitch.sh old mode 100644 new mode 100755 diff --git a/dots/bin/startup.sh b/dots/bin/startup.sh old mode 100644 new mode 100755 diff --git a/dots/bin/syncDirSetup.sh b/dots/bin/syncDirSetup.sh old mode 100644 new mode 100755 diff --git a/dots/bin/toilets.sh b/dots/bin/toilets.sh old mode 100644 new mode 100755 diff --git a/dots/bin/tp.sh b/dots/bin/tp.sh old mode 100644 new mode 100755 diff --git a/dots/bin/webserver.sh b/dots/bin/webserver.sh old mode 100644 new mode 100755 diff --git a/dots/ssh/config b/dots/ssh/config index 0afb7d4..a83efdc 100644 --- a/dots/ssh/config +++ b/dots/ssh/config @@ -8,3 +8,7 @@ Host quickSilver HostName 46.62.245.126 IdentityFile ~/.ssh/251110_quickSystems + +Host weba + HostName 178.156.192.201 + IdentityFile ~/.ssh/251110_ed25519_klevstul diff --git a/obsolete/scripts/99_deploy.wHyprland.sh b/obsolete/scripts/99_deploy.wHyprland.sh old mode 100644 new mode 100755 diff --git a/scripts/990_comment_add_remove.sh b/scripts/990_comment_add_remove.sh old mode 100644 new mode 100755 diff --git a/scripts/990_key_value_modifier.sh b/scripts/990_key_value_modifier.sh old mode 100644 new mode 100755 diff --git a/scripts/99_deploy.sh b/scripts/99_deploy.sh old mode 100644 new mode 100755 diff --git a/scripts/99_software.sh b/scripts/99_software.sh old mode 100644 new mode 100755 diff --git a/scripts/99_yay.sh b/scripts/99_yay.sh old mode 100644 new mode 100755 diff --git a/scripts/archinstall_config_download.sh b/scripts/archinstall_config_download.sh old mode 100644 new mode 100755 diff --git a/scripts/ct.sh b/scripts/ct.sh old mode 100644 new mode 100755 diff --git a/scripts/ctsetup.sh b/scripts/ctsetup.sh old mode 100644 new mode 100755 diff --git a/scripts/obsolete/260224.99_deploy.sh b/scripts/obsolete/260224.99_deploy.sh old mode 100644 new mode 100755