minor fixes

diff --git a/fai/config/package_config/UBUNTU.gpg b/fai/config/package_config/UBUNTU.gpg
new file mode 100644 (file)
index 0000000..544b4af
Binary files /dev/null and b/fai/config/package_config/UBUNTU.gpg differ

diff --git a/wrt-setup b/wrt-setup
index 1a858643fb78018477575f83653995ecf0ea17b2..55de7695298620884466057fd067ee7bfe0d7a1a 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -38,11 +38,11 @@ bash, we can use ${@@Q} to properly pass an empty var.
 
 
 Note, if we dont have internet yet, then just download the bash package,
 
 
 Note, if we dont have internet yet, then just download the bash package,

-scp it over manually and install it, eg:
+rsync it over manually and install it, eg:

 
 cat /etc/opkg/distfeeds.conf
 wget https://librecmc.org/librecmc/downloads/snapshots/v1.5.1-core/packages/mips_24kc/packages/bash_5.0-3_mips_24kc.ipk
 
 cat /etc/opkg/distfeeds.conf
 wget https://librecmc.org/librecmc/downloads/snapshots/v1.5.1-core/packages/mips_24kc/packages/bash_5.0-3_mips_24kc.ipk

-scp bash_5.0-3_mips_24kc.ipk wrt:
+rsync bash_5.0-3_mips_24kc.ipk wrt:

 ssh wrt
 opkg install /root/bash_5.0-3_mips_24kc.ipk
 EOF
 ssh wrt
 opkg install /root/bash_5.0-3_mips_24kc.ipk
 EOF


@@ -73,13 +73,13 @@ fi
 echo "$0: h=$h"
 # todo: ecdsa key not working with dropbear
 cat ~/.ssh/{h,hrsa,home}.pub | ssh $h dd of=/etc/dropbear/authorized_keys
 echo "$0: h=$h"
 # todo: ecdsa key not working with dropbear
 cat ~/.ssh/{h,hrsa,home}.pub | ssh $h dd of=/etc/dropbear/authorized_keys

-scp /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/fai/dnsmasq-end-lease /a/bin/cedit/cedit $h:/usr/bin
+rsync /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/fai/dnsmasq-end-lease /a/bin/cedit/cedit $h:/usr/bin

 # relay is built for openwrt 18.06.2, r7676-cddd7b4c77
 
 #/a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk \
 
 # relay is built for openwrt 18.06.2, r7676-cddd7b4c77
 
 #/a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk \
 

-scp /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \
+rsync /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \

      /p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk}  /p/c/{ptr,dnsmasq,cmc-firewall}-data /b/bash-bear-trap/bash-bear $h:
      /p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk}  /p/c/{ptr,dnsmasq,cmc-firewall}-data /b/bash-bear-trap/bash-bear $h:

-scp ../openwrtkeyring/usign/* $h:/etc/opkg/keys
+rsync ../openwrtkeyring/usign/* $h:/etc/opkg/keys

 
 ssh $h wrt-init ${HOME_DOMAIN:-b8.nz} "$@"
 
 ssh $h wrt-init ${HOME_DOMAIN:-b8.nz} "$@"

diff --git a/wrt-setup-local b/wrt-setup-local
index d18d7985990252e88406599988e0100d0610c32d..c78fd9000f0ae9102d620f6507d1c7fd885e05c9 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -793,7 +793,7 @@ config redirect
  option src              wan
  option src_dport        80
  option dest             lan
  option src              wan
  option src_dport        80
  option dest             lan

- option dest_ip          $l.9
+ option dest_ip          $l.3

  option proto            tcp
 config rule
  option src              wan
  option proto            tcp
 config rule
  option src              wan


@@ -806,7 +806,7 @@ config redirect
  option src              wan
  option src_dport        443
  option dest             lan
  option src              wan
  option src_dport        443
  option dest             lan

- option dest_ip          $l.9
+ option dest_ip          $l.3

  option proto            tcp
 config rule
  option src              wan
  option proto            tcp
 config rule
  option src              wan