iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
limit fai nfs export to host being installed
[automated-distro-installer]
/
wrt-setup
diff --git
a/wrt-setup
b/wrt-setup
index 410c7a0a5b5e4cfa7ca636f4e9b59f1612bcc728..17c31c22da54a30d7a667534adf248cc8f92adea 100755
(executable)
--- a/
wrt-setup
+++ b/
wrt-setup
@@
-25,7
+25,6
@@
pmirror() {
# doesn't go into the firmware. build new firmware if you want
# lots of upgrades.
f=(/tmp/opkg-lists/*)
# doesn't go into the firmware. build new firmware if you want
# lots of upgrades.
f=(/tmp/opkg-lists/*)
- f=${f[0]}
if ! (( $(date -r $f +%s) + 60*60*24 > $(date +%s) )); then
opkg update
fi
if ! (( $(date -r $f +%s) + 60*60*24 > $(date +%s) )); then
opkg update
fi
@@
-172,6
+171,13
@@
v /etc/init.d/nfsd enable
# EOF
# EOF
+v cedit /etc/config/network <<'EOF' || v /etc/init.d/network reload
+config 'route' 'transmission'
+ option 'interface' 'lan'
+ option 'target' '10.173.0.0'
+ option 'netmask' '255.255.0.0'
+ option 'gateway' '192.168.1.2'
+EOF
v cedit /etc/config/firewall <<'EOF' || firewall_restart=true
config redirect
v cedit /etc/config/firewall <<'EOF' || firewall_restart=true
config redirect
@@
-186,7
+192,7
@@
config rule
option dest_port 22
config redirect
option dest_port 22
config redirect
- option name ssh
+ option name ssh
alt
option src wan
option src_dport 2222
option dest_port 22
option src wan
option src_dport 2222
option dest_port 22
@@
-220,6
+226,18
@@
config rule
option target ACCEPT
option dest_port 80
option proto tcp
option target ACCEPT
option dest_port 80
option proto tcp
+
+config redirect
+ option name syncthing
+ option src wan
+ option src_dport 22001
+ option dest_ip 192.168.1.2
+ option dest lan
+config rule
+ option src wan
+ option target ACCEPT
+ option dest_port 22001
+
EOF
EOF
@@
-228,20
+246,20
@@
EOF
dnsmasq_restart=false
v cedit /etc/hosts <<EOF || dnsmasq_restart=true
192.168.1.1 wrt
dnsmasq_restart=false
v cedit /etc/hosts <<EOF || dnsmasq_restart=true
192.168.1.1 wrt
-192.168.1.2 treetowl
$IMPERSONAL
_DOMAIN
-192.168.1.3 frodo
+192.168.1.2 treetowl
mail.iankelling.org $HOME
_DOMAIN
+192.168.1.3 frodo
faiserver
192.168.1.4 htpc
192.168.1.5 x2
192.168.1.4 htpc
192.168.1.5 x2
-192.168.1.6
testvm
-192.168.1.7 faiserver
+192.168.1.6
demohost
+
#
192.168.1.7 faiserver
192.168.1.8 tp
192.168.1.8 tp
+192.168.1.9 n5
72.14.176.105 li
72.14.176.105 li
-45.33.
1.160
lj
+45.33.
9.11
lj
138.68.10.24 dopub
138.68.10.24 dopub
-# cant ssh to do when on vpn. some routing/firewall rule or something,
-# I don't know. I can get there from wrt but not my machine.
-# but we can get to it from this address, so, good enough.
-10.8.0.1 do
+# netns creation looks for next free subnet starting at 10.173, but I only
+# use one, and I would keep this one as the first created.
+10.173.0.2 transmission
EOF
EOF
@@
-257,6
+275,10
@@
fi
# useful: http://wiki.openwrt.org/doc/howto/dhcp.dnsmasq
# useful: http://wiki.openwrt.org/doc/howto/dhcp.dnsmasq
+# sometimes /mnt/usb fails, cuz it's just a flash drive,
+# so make sure we have this dir or else dnsmasq will fail
+# to start.
+mkdir -p /mnt/usb/tftpboot
v cedit /etc/dnsmasq.conf <<'EOF' || dnsmasq_restart=true
############ updating dns servers ###################3
v cedit /etc/dnsmasq.conf <<'EOF' || dnsmasq_restart=true
############ updating dns servers ###################3
@@
-305,8
+327,9
@@
dhcp-host=00:1f:16:16:39:24,set:x2,192.168.1.5,x2
# reformatted. The mac is from doing a virt-install, cancelling it,
# and copying the generated mac, so it should be randomish.
dhcp-host=52:54:00:9c:ef:ad,set:demohost,192.168.1.6,demohost
# reformatted. The mac is from doing a virt-install, cancelling it,
# and copying the generated mac, so it should be randomish.
dhcp-host=52:54:00:9c:ef:ad,set:demohost,192.168.1.6,demohost
-dhcp-host=52:54:00:56:09:f9,set:faiserver,192.168.1.7,faiserver
+
#
dhcp-host=52:54:00:56:09:f9,set:faiserver,192.168.1.7,faiserver
dhcp-host=80:fa:5b:1c:6e:cf,set:tp,192.168.1.8,tp
dhcp-host=80:fa:5b:1c:6e:cf,set:tp,192.168.1.8,tp
+dhcp-host=c4:43:8f:f2:79:1f,set:n5,192.168.1.9,n5
# this is the ip it picks by default if dhcp fails,
# so might as well use it.
# hostname is the name it uses according to telnet
# this is the ip it picks by default if dhcp fails,
# so might as well use it.
# hostname is the name it uses according to telnet