iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes, prometheus, lots of stuff
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index d3a7b2a7663c09dbbf6cbee679a75790383c8dc6..defb8321d87e1fef55112a6c11e8f28f8e7ff52e 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-81,7
+81,10
@@
common-file-setup() {
for dir in "$@"; do
fs=$dir/filesystem
if [[ -e $fs && $user =~ ^iank?$ ]]; then
for dir in "$@"; do
fs=$dir/filesystem
if [[ -e $fs && $user =~ ^iank?$ ]]; then
- cmd=( s rsync -aiSAX --chown=root:root --chmod=g-s
+ # we dont want t, instead c for checksum.
+ # That way we dont set times on directories.
+ # -a = -rlptgoD
+ cmd=( s rsync -rclpgoDiSAX --chown=root:root --chmod=g-s
--exclude=/etc/dovecot/users
--exclude='/etc/exim4/passwd*'
--exclude='/etc/exim4/*.pem'
--exclude=/etc/dovecot/users
--exclude='/etc/exim4/passwd*'
--exclude='/etc/exim4/*.pem'
@@
-92,7
+95,11
@@
common-file-setup() {
case $file in
etc/prometheus/rules/iank.yml)
case $HOSTNAME in
case $file in
etc/prometheus/rules/iank.yml)
case $HOSTNAME in
- kd) m s systemctl reload prometheus ;;
+ kd)
+ if systemctl is-active prometheus &>/dev/null; then
+ m s systemctl reload prometheus
+ fi
+ ;;
esac
;;
etc/systemd/system/*)
esac
;;
etc/systemd/system/*)
@@
-115,7
+122,7
@@
common-file-setup() {
done < <("${cmd[@]}")
fi
done < <("${cmd[@]}")
fi
- if [[ -e $dir/subdir_files ]]; then
+ if
! $fast &&
[[ -e $dir/subdir_files ]]; then
m subdir-link-r $dir/subdir_files
fi
local x=( $dir/!(binds|subdir_files|filesystem|machine_specific|..|.|.#*) )
m subdir-link-r $dir/subdir_files
fi
local x=( $dir/!(binds|subdir_files|filesystem|machine_specific|..|.|.#*) )
@@
-185,7
+192,7
@@
case $user in
for f in /etc/prometheus-{,export-}htpasswd; do
if [[ -e $f ]]; then
s chmod 640 $f
for f in /etc/prometheus-{,export-}htpasswd; do
if [[ -e $f ]]; then
s chmod 640 $f
- if getent passwd www-data; then
+ if getent passwd www-data
&>/dev/null
; then
s chown root:www-data $f
fi
fi
s chown root:www-data $f
fi
fi
@@
-194,15
+201,15
@@
case $user in
if [[ -e $f ]]; then
# note: this is duplicative of the file's own permissions
s chmod 640 $f /etc/prometheus-pass
if [[ -e $f ]]; then
# note: this is duplicative of the file's own permissions
s chmod 640 $f /etc/prometheus-pass
- if getent passwd prometheus; then
+ if getent passwd prometheus
&>/dev/null
; then
s chown root:prometheus $f
fi
fi
s chown root:prometheus $f
fi
fi
-
-
##### end special extra stuff #####
##### end special extra stuff #####
- m sudo -H -u user2 "${BASH_SOURCE[0]}"
+ if ! $fast; then
+ m sudo -H -u user2 "${BASH_SOURCE[0]}"
+ fi
f=/a/bin/distro-setup/system-status
if [[ -x $f ]]; then
f=/a/bin/distro-setup/system-status
if [[ -x $f ]]; then