iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1059b8a
)
robustness
author
Ian Kelling
<ian@iankelling.org>
Fri, 2 Aug 2019 14:35:27 +0000
(10:35 -0400)
committer
Ian Kelling
<ian@iankelling.org>
Fri, 2 Aug 2019 14:35:27 +0000
(10:35 -0400)
conflink
patch
|
blob
|
history
dynamic-ip-update
patch
|
blob
|
history
diff --git
a/conflink
b/conflink
index f62de8b454c20da5f6867abb02e347c7dd80688c..5f38a596ab113943664db9dbc3805489704acfe6 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-47,7
+47,7
@@
common-file-setup() {
local dir fs x bdir f dst
for dir in "$@"; do
fs=$dir/filesystem
local dir fs x bdir f dst
for dir in "$@"; do
fs=$dir/filesystem
- if [[ -e $fs && $
USER
=~ ^iank?$ ]]; then
+ if [[ -e $fs && $
user
=~ ^iank?$ ]]; then
# note, symlinks get resolved, not copied.
s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
fi
# note, symlinks get resolved, not copied.
s tar --mode=g-s --owner=0 --group=0 -cz -C $fs . | s tar -xz -C /
fi
@@
-61,6
+61,7
@@
common-file-setup() {
done
}
done
}
+user=$(id -un)
all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
# note, we assume a group of hosts does not have the
# same name as a single host, which is no problem on our scale.
all_dirs=({/a/c,/p/c}{,/machine_specific/$HOSTNAME})
# note, we assume a group of hosts does not have the
# same name as a single host, which is no problem on our scale.
@@
-69,7
+70,7
@@
for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
done
c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
done
c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
-case $
USER
in
+case $
user
in
iank)
files=(/p/c/machine_specific/*/filesystem/etc/ssh/*_key
/p/c/filesystem/etc/openvpn/client/*.key
iank)
files=(/p/c/machine_specific/*/filesystem/etc/ssh/*_key
/p/c/filesystem/etc/openvpn/client/*.key
diff --git
a/dynamic-ip-update
b/dynamic-ip-update
index 3ece5b3fa1cb541b4a343d178ca1f51c884319e3..3ba7f34998098fab2ec80be10fdd9b165402ec40 100755
(executable)
--- a/
dynamic-ip-update
+++ b/
dynamic-ip-update
@@
-90,7
+90,8
@@
exit
mkc /p/c/machine_specific/li/filesystem/etc/bind
s dnssec-keygen -a HMAC-SHA512 -b 512 -n HOST b8.nz
mkc /p/c/machine_specific/li/filesystem/etc/bind
s dnssec-keygen -a HMAC-SHA512 -b 512 -n HOST b8.nz
-s chown $USER:$USER *
+user=$(id -un)
+s chown $user:$user *
f=key.b8.nz
f=key.b8.nz