Merge branch 'master' into certbot-revamp-config-file

root/etc/s6-overlay/s6-rc.d/init-certbot-config/run

@@ -47,12 +47,12 @@ touch /config/etc/letsencrypt/cli.ini
 grep -qF 'agree-tos' /config/etc/letsencrypt/cli.ini || echo 'agree-tos=true' >>/config/etc/letsencrypt/cli.ini
 
 # copy dns default configs
-cp -n /defaults/dns-conf/* /config/dns-conf/
+cp -n /defaults/dns-conf/* /config/dns-conf/ 2> >(grep -v 'cp: not replacing')
 lsiown -R abc:abc /config/dns-conf
 
 # copy default renewal hooks
 chmod -R +x /defaults/etc/letsencrypt/renewal-hooks
-cp -nR /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/
+cp -nR /defaults/etc/letsencrypt/renewal-hooks/* /config/etc/letsencrypt/renewal-hooks/ 2> >(grep -v 'cp: not replacing')
 lsiown -R abc:abc /config/etc/letsencrypt/renewal-hooks
 
 # replace nginx service location in renewal hooks

root/etc/s6-overlay/s6-rc.d/init-crontabs-config/run

@@ -15,7 +15,7 @@ if [[ ! -f /config/crontabs/root ]]; then
 
     # if crontabs still do not exist in config (were not copied from system)
     # copy crontab from included defaults (using -n, do not overwrite an existing file)
-    cp -n /etc/crontabs/root /config/crontabs/
+    cp -n /etc/crontabs/root /config/crontabs/ 2> >(grep -v 'cp: not replacing')
 fi
 # set permissions and import user crontabs
 lsiown root:root /config/crontabs/root
@@ -31,7 +31,7 @@ if [[ ! -f /config/crontabs/abc ]]; then
 
     # if crontabs still do not exist in config (were not copied from system)
     # copy crontab from included defaults (using -n, do not overwrite an existing file)
-    cp -n /etc/crontabs/abc /config/crontabs/
+    cp -n /etc/crontabs/abc /config/crontabs/ 2> >(grep -v 'cp: not replacing')
 fi
 # set permissions and import user crontabs
 lsiown abc:abc /config/crontabs/abc