diff --git a/build.sh b/build.sh index 6d1c9cf..94ecbd3 100644 --- a/build.sh +++ b/build.sh @@ -71,7 +71,7 @@ capsh --drop=cap_setfcap -- -c "$BOOTSTRAP_CMD \ --components=main,contrib,non-free \ --arch armhf \ --keyring $KEYS_DIR/raspbian-archive-keyring.gpg \ - --include=ca-certificates,apt-transport-https \ + --include=ca-certificates \ jessie \ $ROOTFS_DIR \ http://mirrordirector.raspbian.org/raspbian/" || rmdir "$ROOTFS_DIR/debootstrap/" @@ -122,7 +122,6 @@ ln -nsf /proc/mounts "$ROOTFS_DIR/etc/mtab" apply_file 644 '/etc/apt/sources.list' on_chroot apt-key add - < "$KEYS_DIR/raspberrypi-archive-keyring.gpg" -on_chroot apt-key add - < "$KEYS_DIR/i2p-archive-keyring.gpg" apply_file 644 '/etc/apt/apt.conf.d/02noinstall' apply_file 644 '/etc/apt/apt.conf.d/50pdiffs' @@ -276,13 +275,6 @@ EOF apply_file 644 '/etc/tor/torrc' -## -# Install I2P. -# -on_chroot << EOF -apt-get install -y i2p -EOF - ## # Configure firewall. # diff --git a/files/etc/apt/sources.list b/files/etc/apt/sources.list index 4f79c71..e334582 100644 --- a/files/etc/apt/sources.list +++ b/files/etc/apt/sources.list @@ -1,3 +1,2 @@ deb http://mirrordirector.raspbian.org/raspbian jessie main deb http://archive.raspberrypi.org/debian jessie main -deb https://deb.i2p2.de jessie main diff --git a/files/etc/iptables/rules.v4 b/files/etc/iptables/rules.v4 index fbe74b9..1d757cc 100644 --- a/files/etc/iptables/rules.v4 +++ b/files/etc/iptables/rules.v4 @@ -7,10 +7,6 @@ -A PREROUTING -i eth0 -p udp --dport 5353 -j REDIRECT --to-ports 5353 # Tor SOCKS proxy -A PREROUTING -i eth0 -p tcp --dport 9050 -j REDIRECT --to-ports 9050 -# I2P router console web interface --A PREROUTING -i eth0 -p tcp --dport 7657 -j DNAT --to-destination 127.0.0.1:7657 -# I2P HTTP proxy --A PREROUTING -i eth0 -p tcp --dport 4444 -j DNAT --to-destination 127.0.0.1:4444 # Tor transparent proxy -A PREROUTING -i eth0 -p tcp --syn -j REDIRECT --to-ports 9040 diff --git a/files/etc/sysctl.conf b/files/etc/sysctl.conf index 755baf2..efc6f78 100644 --- a/files/etc/sysctl.conf +++ b/files/etc/sysctl.conf @@ -11,8 +11,3 @@ net.ipv6.conf.default.disable_ipv6 = 1 net.ipv6.conf.lo.disable_ipv6 = 1 net.ipv6.conf.eth0.disable_ipv6 = 1 net.ipv6.conf.wlan0.disable_ipv6 = 1 - -## -# Allow NAT to localhost (for I2P). -# -net.ipv4.conf.eth0.route_localnet = 1 diff --git a/keys/i2p-archive-keyring.gpg b/keys/i2p-archive-keyring.gpg deleted file mode 100644 index 4e7a92a..0000000 Binary files a/keys/i2p-archive-keyring.gpg and /dev/null differ