iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
important fix
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 03c58408443153340df5557c75a221962c512975..18a6ed84f0dc177c85e72ccf0aaa5adc075e93ca 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-114,7
+114,8
@@
common-file-setup() {
# we dont want t, instead c for checksum.
# That way we dont set times on directories.
# -a = -rlptgoD
# we dont want t, instead c for checksum.
# That way we dont set times on directories.
# -a = -rlptgoD
- cmd=( s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:root
+ # -A is acls, implies -p
+ cmd=( s rsync -rclgoDiSAX --chmod=Dg-s --chown=root:root
--exclude=/etc/dovecot/users
--exclude='/etc/exim4/passwd*'
--exclude='/etc/exim4/*.pem'
--exclude=/etc/dovecot/users
--exclude='/etc/exim4/passwd*'
--exclude='/etc/exim4/*.pem'
@@
-231,21
+232,18
@@
case $user in
fi
if [[ -e /p/c/user-specific ]]; then
if getent passwd prometheus &>/dev/null; then
fi
if [[ -e /p/c/user-specific ]]; then
if getent passwd prometheus &>/dev/null; then
- s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus-pass /etc
+ v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus-pass /etc
+ v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus/ssl/* /etc/prometheus/ssl
fi
if getent passwd www-data &>/dev/null; then
fi
if getent passwd www-data &>/dev/null; then
- s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc
- fi
- fi
- f=/etc/nagios4/htdigest.users
- if [[ -e $f ]]; then
- if getent passwd nagios &>/dev/null; then
- s chown nagios:www-data $f
+ v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc
fi
fi
fi
fi
- if [[ -d /var/lib/bitcoind ]]; then
+ if [[ -d /var/lib/bitcoind
&& -d /p/c/user-specific/bitcoin
]]; then
s rsync -clpgoDiSAX --chmod=Dg-s --chown=bitcoin:bitcoin /p/c/user-specific/bitcoin/settings.json /var/lib/bitcoind
s rsync -clpgoDiSAX --chmod=Dg-s --chown=bitcoin:bitcoin /p/c/user-specific/bitcoin/settings.json /var/lib/bitcoind
+ # i'm not sure of the perfect permissions here, but
+ # 640 seems good.
s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:bitcoin /p/c/user-specific/bitcoin/bitcoin /etc
fi
##### end special extra stuff #####
s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:bitcoin /p/c/user-specific/bitcoin/bitcoin /etc
fi
##### end special extra stuff #####