unify dns related config, change some dns settings

[distro-setup] / nextcloud-setup

diff --git a/nextcloud-setup b/nextcloud-setup
index 75e1625192c6260aaa11c43fcbc58cb0fd725ce6..ebeaae110806afc489a6eebbd600ac0561186376 100755 (executable)
--- a/nextcloud-setup
+++ b/nextcloud-setup
@@ -1,10 +1,27 @@
 #!/bin/bash
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
 
-if [[ -s /usr/local/lib/bash-bear ]]; then
-  source /usr/local/lib/bash-bear
-else
-  exit 1
-fi
+# Copyright 2024 Ian Kelling
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+set -e; . /usr/local/lib/bash-bear; set +e
 
 
 pre="${0##*/}:"
@@ -25,6 +42,7 @@ i() { # install file
   tmp=$(rsync -ic $tmpdir/"$base" "$dest")
   if [[ $tmp ]]; then
     printf "%s\n" "$tmp"
+    # shellcheck disable=SC2034
     ir=true
     if [[ $dest == /etc/systemd/system/* ]]; then
       touch /var/local/mail-setup-reload
@@ -217,7 +235,7 @@ systemctl enable --now $ncbase.timer
 i /usr/local/bin/ncup <<'EOFOUTER'
 #!/bin/bash
 
-source /usr/local/lib/bash-bear
+set -e; . /usr/local/lib/bash-bear; set +e
 
 m() { printf "%s\n" "$*";  "$@"; }
 err-cleanup() {