X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=wrt-setup;h=1c4a033c3f3c4cf9c92ab70bd1aa612920db6379;hp=d721f6ad36aa3d976e75add20920bb55f4953ec9;hb=05e47f6734e5a9354a3243686ae55fe4ab2b72c7;hpb=e6c8a36522847eca91819ab3eb656dd824bc3e3c diff --git a/wrt-setup b/wrt-setup index d721f6a..1c4a033 100755 --- a/wrt-setup +++ b/wrt-setup @@ -15,7 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace" +set -eE -o pipefail +trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR + pmirror() { # background: upgrading all packages is not recommended because it @@ -89,28 +91,32 @@ mkdir -p /run/archiso/bootmnt # todo: at some later time, i found /mnt/usb not mounted, watch to see if # that is the case after running this or rebooting. # wiki says safe to do in case of fstab changes: -cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; } -config global automount - option from_fstab 1 - option anon_mount 1 - -config global autoswap - option from_fstab 1 - option anon_swap 1 - -config mount - option target /mnt/usb - option device /dev/sda2 - option fstype ext4 - option options rw,async,noatime,nodiratime - option enabled 1 - option enabled_fsck 0 - -config swap - option device /dev/sda1 - option enabled 1 -EOF +## ian: commented and replaced with just an echo +## since usb port seems to be busted. +echo | cedit /etc/config/fstab ||: +# cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; } +# config global automount +# option from_fstab 1 +# option anon_mount 1 + +# config global autoswap +# option from_fstab 1 +# option anon_swap 1 + +# config mount +# option target /mnt/usb +# option device /dev/sda2 +# option fstype ext2 +# option options rw,async,noatime,nodiratime +# option enabled 1 +# option enabled_fsck 0 + +# config swap +# option device /dev/sda1 +# option enabled 1 + +# EOF @@ -173,7 +179,7 @@ config 'route' 'transmission' option 'interface' 'lan' option 'target' '10.173.0.0' option 'netmask' '255.255.0.0' - option 'gateway' '192.168.1.2' + option 'gateway' '192.168.1.3' EOF v cedit /etc/config/firewall <<'EOF' || firewall_restart=true @@ -181,7 +187,7 @@ config redirect option name ssh option src wan option src_dport 22 - option dest_ip 192.168.1.2 + option dest_ip 192.168.1.8 option dest lan config rule option src wan @@ -204,7 +210,7 @@ config redirect option src wan option src_dport 443 option dest lan - option dest_ip 192.168.1.2 + option dest_ip 192.168.1.8 option proto tcp config rule option src wan @@ -214,14 +220,14 @@ config rule config redirect option src wan - option src_dport 1194 + option src_dport 1196 option dest lan - option dest_ip 192.168.1.2 + option dest_ip 192.168.1.8 option proto udp config rule option src wan option target ACCEPT - option dest_port 1194 + option dest_port 1196 option proto udp @@ -229,7 +235,7 @@ config redirect option src wan option src_dport 80 option dest lan - option dest_ip 192.168.1.2 + option dest_ip 192.168.1.8 option proto tcp config rule option src wan @@ -241,7 +247,7 @@ config redirect option name syncthing option src wan option src_dport 22001 - option dest_ip 192.168.1.2 + option dest_ip 192.168.1.8 option dest lan config rule option src wan @@ -256,17 +262,21 @@ EOF dnsmasq_restart=false +mail_host=$(grep -F mail.iankelling.org /etc/hosts | awk '{print $1}') v cedit /etc/hosts <