#!/bin/bash
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
err-cleanup() {
echo 1 >~/.local/conflink
}
}
+s() { sudo "$@"; }
m() {
"$@"
}
-s() { sudo "$@"; }
v() {
echo "$*"
"$@"
##### end command line parsing ########
+tmpf=$(mktemp)
if $fast; then
lnf() { ln -sf "$@"; }
fi
common-file-setup() {
local dir fs x f reload_systemd
- local -a reload_services
local -a restart_services
reload_systemd=false
+ # note, i ran chmod -R g-s on the filesystem dirs
+ # so i could keep permissions of secret files
for dir in "$@"; do
fs=$dir/filesystem
if [[ -e $fs && $user =~ ^iank?$ ]]; then
# 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
+ # -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'
$fs/ / )
- m "${cmd[@]@Q}"
+ echo "${cmd[@]@Q}"
+ "${cmd[@]}" | tee $tmpf
while read -r line; do
file="${line:12}"
case $file in
# A = preserve acls
# X = preserve extended attributes
# i = itemize
- done < <("${cmd[@]}")
+ done <$tmpf
fi
if ! $fast && [[ -e $dir/subdir_files ]]; then
m s chgrp -R bind $f
m s chmod g+w $f
fi
- sudo bash -c 'shopt -s nullglob; for f in /etc/bind/*.key /etc/bind/*.private /etc/bind/key.*; do chgrp bind $f; done'
+ s bash -c 'shopt -s nullglob; for f in /etc/bind/*.key /etc/bind/*.private /etc/bind/key.*; do chgrp bind $f; done'
if [[ -e /etc/caldav-htpasswd ]] && getent group www-data &>/dev/null; then
s chgrp www-data /etc/caldav-htpasswd
fi
if [[ -e /var/lib/znc ]] && getent group znc; then
s chown -R znc:znc /var/lib/znc
fi
- for f in /etc/prometheus-{,export-}htpasswd; do
- if [[ -e $f ]]; then
- s chmod 640 $f
- if getent passwd www-data &>/dev/null; then
- s chown root:www-data $f
- fi
- fi
- done
- 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 [[ -e /p/c/user-specific ]]; then
if getent passwd prometheus &>/dev/null; then
- s chown root:prometheus $f
+ 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
+ v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc
fi
fi
+
+ 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 -rclpgoDiSAX --chmod=Dg-s --chown=root:bitcoin /p/c/user-specific/bitcoin/bitcoin /etc
+ fi
##### end special extra stuff #####
if ! $fast; then
- m sudo -H -u user2 "${BASH_SOURCE[0]}"
+ m s -H -u user2 "${BASH_SOURCE[0]}"
fi
f=/a/bin/distro-setup/system-status