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
cleanup classes, populate ssh server keys
[automated-distro-installer]
/
wrt-setup
diff --git
a/wrt-setup
b/wrt-setup
index 755f2d4baac3bc47568e026f1bb5c372707e3e56..c04708da3276d2533e015eb81631d11f50e2b157 100755
(executable)
--- a/
wrt-setup
+++ b/
wrt-setup
@@
-172,6
+172,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
@@
-184,6
+191,42
@@
config rule
option src wan
option target ACCEPT
option dest_port 22
option src wan
option target ACCEPT
option dest_port 22
+
+config redirect
+ option name ssh
+ option src wan
+ option src_dport 2222
+ option dest_port 22
+ option dest_ip 192.168.1.3
+ option dest lan
+config rule
+ option src wan
+ option target ACCEPT
+ option dest_port 2222
+
+config redirect
+ option src wan
+ option src_dport 443
+ option dest lan
+ option dest_ip 192.168.1.2
+ option proto tcp
+config rule
+ option src wan
+ option target ACCEPT
+ option dest_port 443
+ option proto tcp
+
+config redirect
+ option src wan
+ option src_dport 80
+ option dest lan
+ option dest_ip 192.168.1.2
+ option proto tcp
+config rule
+ option src wan
+ option target ACCEPT
+ option dest_port 80
+ option proto tcp
EOF
EOF
@@
-192,19
+235,19
@@
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.2 treetowl $IMPERSONAL_DOMAIN
faiserver
192.168.1.3 frodo
192.168.1.4 htpc
192.168.1.5 x2
192.168.1.3 frodo
192.168.1.4 htpc
192.168.1.5 x2
-192.168.1.6 testvm
+192.168.1.6 demohost
+#192.168.1.7 faiserver
192.168.1.8 tp
72.14.176.105 li
45.33.1.160 lj
138.68.10.24 dopub
192.168.1.8 tp
72.14.176.105 li
45.33.1.160 lj
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
@@
-268,7
+311,7
@@
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
# this is the ip it picks by default if dhcp fails,
# so might as well use it.
dhcp-host=80:fa:5b:1c:6e:cf,set:tp,192.168.1.8,tp
# this is the ip it picks by default if dhcp fails,
# so might as well use it.