diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/torouter-prep/configs/etc/dhcp/dhcpd.conf | 32 | ||||
| -rw-r--r-- | packages/torouter-prep/configs/etc/dnsmasq.conf | 7 | ||||
| -rw-r--r-- | packages/torouter-prep/configs/etc/dnsmasq.d/lan | 2 | ||||
| -rw-r--r-- | packages/torouter-prep/configs/etc/dnsmasq.d/wifi | 2 | ||||
| -rw-r--r-- | packages/torouter-prep/configs/etc/udhcpd.conf | 26 | ||||
| -rw-r--r-- | packages/torouter-prep/configs/tmp/047E6A24.asc | 19 | ||||
| -rw-r--r-- | packages/torouter-prep/configs/tmp/armrc.sample.gz | bin | 0 -> 3633 bytes | |||
| -rw-r--r-- | packages/torouter-prep/configs/tmp/tor-arm-crontab | 3 | ||||
| -rw-r--r-- | packages/torouter-prep/debian/control | 2 | ||||
| -rwxr-xr-x | packages/torouter-prep/src/torouter_preboot.sh | 2 |
10 files changed, 32 insertions, 63 deletions
diff --git a/packages/torouter-prep/configs/etc/dhcp/dhcpd.conf b/packages/torouter-prep/configs/etc/dhcp/dhcpd.conf deleted file mode 100644 index ec502c6..0000000 --- a/packages/torouter-prep/configs/etc/dhcp/dhcpd.conf +++ /dev/null @@ -1,32 +0,0 @@ -# -# FreedomBox ISC dhcpd configuration -# -# - -# The ddns-updates-style parameter controls whether or not the server will -# attempt to do a DNS update when a lease is confirmed. We default to the -# behavior of the version 2 packages ('none', since DHCP v2 didn't -# have support for DDNS.) -ddns-update-style none; - -# option definitions common to all supported networks... -option domain-name "free.dom"; -option domain-name-servers ns1.free.dom, ns2.free.dom; - -default-lease-time 600; -max-lease-time 7200; - -# If this DHCP server is the official DHCP server for the local -# network, the authoritative directive should be uncommented. -authoritative; - -# Use this to send dhcp log messages to a different log file (you also -# have to hack syslog.conf to complete the redirection). -log-facility local7; - -# basic subnet configuration for the 'downstream' wired network - -subnet 192.168.1.0 netmask 255.255.255.0 { - range 192.168.1.10 192.168.1.100; - option routers 192.168.1.1; -} diff --git a/packages/torouter-prep/configs/etc/dnsmasq.conf b/packages/torouter-prep/configs/etc/dnsmasq.conf index 2711486..8e02834 100644 --- a/packages/torouter-prep/configs/etc/dnsmasq.conf +++ b/packages/torouter-prep/configs/etc/dnsmasq.conf @@ -94,7 +94,6 @@ except-interface=lo # configure it as shown above, and then use the following line to # disable DHCP on it. #no-dhcp-interface= -#no-dns-interface=uap0 # On systems which support it, dnsmasq binds the wildcard address, # even when it is listening on only some interfaces. It then discards @@ -137,8 +136,8 @@ bind-interfaces # repeat this for each network on which you want to supply DHCP # service. #dhcp-range=192.168.0.50,192.168.0.150,12h -dhcp-range=10.23.42.10,10.23.42.254,255.255.255.0,12h -dhcp-range=172.16.23.10,172.16.23.254,255.255.255.0,12h + +# see also /etc/dnsmasq.d/lan and /etc/dnsmasq.d/wifi # This is an example of a DHCP range where the netmask is given. This # is needed for networks we reach the dnsmasq DHCP server via a relay @@ -554,4 +553,4 @@ dhcp-range=172.16.23.10,172.16.23.254,255.255.255.0,12h # Include a another lot of configuration options. #conf-file=/etc/dnsmasq.more.conf -#conf-dir=/etc/dnsmasq.d +conf-dir=/etc/dnsmasq.d diff --git a/packages/torouter-prep/configs/etc/dnsmasq.d/lan b/packages/torouter-prep/configs/etc/dnsmasq.d/lan new file mode 100644 index 0000000..1430733 --- /dev/null +++ b/packages/torouter-prep/configs/etc/dnsmasq.d/lan @@ -0,0 +1,2 @@ + +dhcp-range=10.23.42.10,10.23.42.254,255.255.255.0,12h diff --git a/packages/torouter-prep/configs/etc/dnsmasq.d/wifi b/packages/torouter-prep/configs/etc/dnsmasq.d/wifi new file mode 100644 index 0000000..d1bdb72 --- /dev/null +++ b/packages/torouter-prep/configs/etc/dnsmasq.d/wifi @@ -0,0 +1,2 @@ + +dhcp-range=172.16.23.10,172.16.23.254,255.255.255.0,12h diff --git a/packages/torouter-prep/configs/etc/udhcpd.conf b/packages/torouter-prep/configs/etc/udhcpd.conf deleted file mode 100644 index 04160aa..0000000 --- a/packages/torouter-prep/configs/etc/udhcpd.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Sample udhcpd configuration file (/etc/udhcpd.conf) - -# The start and end of the IP lease block -start 172.16.23.10 -end 172.16.23.254 - -# The interface that udhcpd will use -interface uap0 - -# The maximim number of leases (includes addressesd reserved -# by OFFER's, DECLINE's, and ARP conficts -max_leases 244 - -# If remaining is true (default), udhcpd will store the time -# remaining for each lease in the udhcpd leases file. This is -# for embedded systems that cannot keep time between reboots. -# If you set remaining to no, the absolute time that the lease -# expires at will be stored in the dhcpd.leases file. -remaining no - -# Use Tor's DNSPort and route via Tor -opt dns 172.16.23.1 -option subnet 255.255.255.0 -opt router 172.16.23.1 -option domain local -option lease 864000 # 10 days of seconds diff --git a/packages/torouter-prep/configs/tmp/047E6A24.asc b/packages/torouter-prep/configs/tmp/047E6A24.asc new file mode 100644 index 0000000..e2a8303 --- /dev/null +++ b/packages/torouter-prep/configs/tmp/047E6A24.asc @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.9 (GNU/Linux) + +mQENBE5MF30BCACy2Ywqme78KCxY0qEXxm0vpBYe9X2kTdaJMS65tLfjbuHJ+WO4 +OKCJ5AJc7NMvZGpVucn4JPTRN34oReXzYWrlm0yfmqnRHm9sEJhDqNbSV6RML+9E +oikxj6w6uboVEnrbLPzsWEcSze28dLcqVzDMm3aHO0erjBMlUEN4a7rrU0MDf+SH +4rz0kkEaBj8gzX+cJQEU5uIdlcINFtL34cNIZPAB3O2ZOjvrDbWJcI6wG/ZfefDk +2z98eSzhJfTWKsjnPmSsp7QTu+lj+mJN7BBoLILLJ+xq1XPJfigiuQucK3k2xMBv +eYEpK+11af6/bt5+yQec8dyH7+feYnpY2gW9ABEBAAG0H3RvcnJvdXRlciBhcmNo +aXZlIGtleSAoMjAxMS0wOCmJAT4EEwECACgFAk5MF30CGwMFCQDtTgAGCwkIBwMC +BhUIAgkKCwQWAgMBAh4BAheAAAoJEJGCGDUEfmokfYEH/RzFD2x5j1kJ+1+F2pTN +bTochEBvT4gsKCcuT+i7Q4FaorVCePoAyjcW3HBGBNf6G0a37KmtPoQBqXZ2wxVN +7SDFFG4nH27z+OdkrZkUmwnjr3O5QskMuiOfkvpD0aRKvmB/MznxjBW9brJr63Gx +IGkdvvZad2V4+jEwTWiOAodWbYGX9A5CgWUL+SHFhsLe3B3ZMrvgbReJqbOGRBTR +nGWYjLH5K0lNLPNb8spKOxT/h5gKib9p5680hQG672n9EJGixfmvrCQF/3cqy2SG +CmfX5Tt7+l/C6LfyaHWHsQsjqVtCmwPjfQ1sRa1S9UPXjrZb/54kDUHfpUByB/ab +kGU= +=ZXbM +-----END PGP PUBLIC KEY BLOCK----- diff --git a/packages/torouter-prep/configs/tmp/armrc.sample.gz b/packages/torouter-prep/configs/tmp/armrc.sample.gz Binary files differnew file mode 100644 index 0000000..c86b6f1 --- /dev/null +++ b/packages/torouter-prep/configs/tmp/armrc.sample.gz diff --git a/packages/torouter-prep/configs/tmp/tor-arm-crontab b/packages/torouter-prep/configs/tmp/tor-arm-crontab new file mode 100644 index 0000000..b662b22 --- /dev/null +++ b/packages/torouter-prep/configs/tmp/tor-arm-crontab @@ -0,0 +1,3 @@ +# Now anyone using the torouter can attach to a long term screen with arm +# This will run at boot time and it should run forever +@reboot screen -d -m -S tor-arm /usr/bin/arm diff --git a/packages/torouter-prep/debian/control b/packages/torouter-prep/debian/control index 7e25103..2a696e0 100644 --- a/packages/torouter-prep/debian/control +++ b/packages/torouter-prep/debian/control @@ -8,7 +8,7 @@ Homepage: <https://www.torproject.org/> Package: torouter-prep Architecture: all -Depends: ${misc:Depends}, openssh-server, isc-dhcp-client, cron-apt, torouter-tui +Depends: ${misc:Depends}, openssh-server, isc-dhcp-client, cron-apt Description: Torouter meta-package to take over the DreamPlug DreamPlug devices may use this package to convert to a Torouter. This package only works if the DreamPlug is already running Debian. diff --git a/packages/torouter-prep/src/torouter_preboot.sh b/packages/torouter-prep/src/torouter_preboot.sh index d179581..404ce83 100755 --- a/packages/torouter-prep/src/torouter_preboot.sh +++ b/packages/torouter-prep/src/torouter_preboot.sh @@ -34,6 +34,8 @@ cp $config_dir/etc/network/interfaces /etc/network/interfaces # Configure dnsmasq cp $config_dir/etc/dnsmasq.conf /etc/dnsmasq.conf +mkdir -p /etc/dnsmasq.d +cp $config_dir/etc/dnsmasq.d/* /etc/dnsmasq.d/ # Configure ntp cp $config_dir/etc/ntp.conf /etc/ntp.conf |