X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=conflink;h=e20da6e94f743b607aac6a17553591ca569e6f00;hp=efc7dd7ed7c56c8bb9b3cd13d601a85b947a7982;hb=dc34d23c63cd83a7cc7a79525445aad3293c7241;hpb=ac3e00755e07d2e298769000f7ea50bc0854b510 diff --git a/conflink b/conflink index efc7dd7..e20da6e 100755 --- a/conflink +++ b/conflink @@ -231,10 +231,11 @@ case $user in 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 - s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc + v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc fi fi