tea/zshlibs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tea:6833e7ed856eccbc0badf5ed668a3c88b48a17e8
Branches Tags
tea:master
..
compare: tea:95b517bf75ec2c790611ecdbcaf5b99a74a2866c
Branches Tags
tea:master

No commits in common. "6833e7ed856eccbc0badf5ed668a3c88b48a17e8" and "95b517bf75ec2c790611ecdbcaf5b99a74a2866c" have entirely different histories.
6833e7ed85 ... 95b517bf75

2 changed files with 4 additions and 14 deletions
Show Stats Expand all files Collapse all files

1
config/gentoo.config.zsh
View File

@ -1,2 +1 @@
plugins+=(portage-edit) plugins+=(portage-edit)
alias rs='sudo rc-service'

17
zssh.funcs.zsh
View File

@ -20,10 +20,6 @@ function zssh_configure ()
zshlibs_ensure -d $zssh_private_configs zshlibs_ensure -d $zssh_private_configs
zshlibs_ensure -d ${zssh_global_configs} zshlibs_ensure -d ${zssh_global_configs}
zshlibs_ensure -d ${zssh_global_pubkeys} zshlibs_ensure -d ${zssh_global_pubkeys}
if ! [[ -d "${zssh_private_configs}" ]]
then
echo 'Include config.d/*.sshconf' > "${zssh_ssh_dotdir}/config_d"
fi
zssh_enumeratenodes zssh_enumeratenodes
if [[ ${#zssh_host_config_accesses} -gt 0 ]] if [[ ${#zssh_host_config_accesses} -gt 0 ]]
then then
@ -93,10 +89,7 @@ function zssh_process()
if [[ ${#zssh_host_config_accesses} -gt 0 ]] if [[ ${#zssh_host_config_accesses} -gt 0 ]]
then then
zshlibs_log zssh_server "processing ssh server setup" zshlibs_log zssh_server "processing ssh server setup"
# - if there is no generated ssh config, if [[ "${HOME}/.config/zsh/local.config.zsh" -nt $(zssh_host_info -c) ]]
# - if local config not older than (means newer than) generated config
# then generate ssh config
if ! [[ "${HOME}/.config/zsh/local.config.zsh" -ot $(zssh_host_info -c) ]]
then then
zshlibs_log zssh_server "publishing our configs …" zshlibs_log zssh_server "publishing our configs …"
zssh_publish_configs zssh_publish_configs
@ -150,7 +143,7 @@ function zssh_mail_pubkey2()
zshlibs_log zssh_client "sending '$(zssh_node_info ${ssh_node} -k) to '$(zssh_node_info ${ssh_node} -M ${zssh_host})'" zshlibs_log zssh_client "sending '$(zssh_node_info ${ssh_node} -k) to '$(zssh_node_info ${ssh_node} -M ${zssh_host})'"
cp -T "$(zssh_node_info ${ssh_node} -k)" "$(zssh_node_info ${ssh_node} -M ${zssh_host})" cp -T "$(zssh_node_info ${ssh_node} -k)" "$(zssh_node_info ${ssh_node} -M ${zssh_host})"
else else
zshlibs_log zssh_client "'$(zssh_node_info ${ssh_node} -M ${zssh_host})' already mailed" zshlibs_log zssh_client "'$(zssh_node_info ${ssh_node} -K ${zssh_host})' already mailed"
fi fi
} }
@ -160,10 +153,8 @@ function zssh_publish_configs()
zshlibs_log zssh_server "generating access configs for parties …" zshlibs_log zssh_server "generating access configs for parties …"
for sshmatch in ${(k)zssh_host_config_accesses} for sshmatch in ${(k)zssh_host_config_accesses}
do do
config_filename="$(zssh_host_info -E ${sshmatch})" zshlibs_log zssh_server "generating our server access config '$(zssh_host_info -E ${sshmatch})'"
config_filename=${config_filename//:/_} zssh_generate_hostaccessconfig $sshmatch > "$(zssh_host_info -E ${sshmatch})"
zshlibs_log zssh_server "generating our server access config '${config_filename}'"
zssh_generate_hostaccessconfig $sshmatch > "${config_filename}"
done done
zshlibs_log zssh_server "updating mtime for $(zssh_host_info -C)" zshlibs_log zssh_server "updating mtime for $(zssh_host_info -C)"
touch "$(zssh_host_info -C)" touch "$(zssh_host_info -C)"