summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xminikrebs/profiles/rickroller/custom_make2
-rw-r--r--minikrebs/profiles/rickroller/customfiles/etc/config/firewall20
-rw-r--r--minikrebs/profiles/rickroller/customfiles/etc/config/uhttpd13
-rw-r--r--minikrebs/profiles/rickroller/customfiles/etc/uhttpd.crtbin0 -> 529 bytes
-rw-r--r--minikrebs/profiles/rickroller/customfiles/etc/uhttpd.keybin0 -> 609 bytes
5 files changed, 12 insertions, 23 deletions
diff --git a/minikrebs/profiles/rickroller/custom_make b/minikrebs/profiles/rickroller/custom_make
index c22348b1..25df33c1 100755
--- a/minikrebs/profiles/rickroller/custom_make
+++ b/minikrebs/profiles/rickroller/custom_make
@@ -1,5 +1,5 @@
#!/bin/sh
#HTTPD="mini-httpd"
-HTTPD="uhttpd"
+HTTPD="uhttpd uhttpd-mod-tls"
make image PROFILE=TLWR703 PACKAGES="$HTTPD dnsmasq wireless-tools -radvd -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe" FILES=customfiles/
diff --git a/minikrebs/profiles/rickroller/customfiles/etc/config/firewall b/minikrebs/profiles/rickroller/customfiles/etc/config/firewall
index 6e95b5cd..56f20aa7 100644
--- a/minikrebs/profiles/rickroller/customfiles/etc/config/firewall
+++ b/minikrebs/profiles/rickroller/customfiles/etc/config/firewall
@@ -93,18 +93,20 @@ config rule
option family ipv6
option target ACCEPT
-# does not seem to work for some reason:
-#config redirect
-# option src lan
-# option proto tcp
-# option src_dport 80
-# option dest_port 80
-
config redirect
- option src lan
+ option src lan
option proto tcp
option src_dport 80
- option src_ip !192.168.23.1
+ option src_ip !192.168.23.1
option dest_port 80
option dest_ip 192.168.23.1
option target DNAT
+
+config redirect
+ option src lan
+ option proto tcp
+ option src_dport 443
+ option src_ip !192.168.23.1
+ option dest_port 443
+ option dest_ip 192.168.23.1
+ option target DNAT
diff --git a/minikrebs/profiles/rickroller/customfiles/etc/config/uhttpd b/minikrebs/profiles/rickroller/customfiles/etc/config/uhttpd
index 0767269b..74695b7c 100644
--- a/minikrebs/profiles/rickroller/customfiles/etc/config/uhttpd
+++ b/minikrebs/profiles/rickroller/customfiles/etc/config/uhttpd
@@ -11,16 +11,3 @@ config uhttpd main
option network_timeout 30
option tcp_keepalive 1
option error_page /index.html
-
-# Certificate defaults for px5g key generator
-config cert px5g
-
- option days 730
-
- option bits 1024
-
- option country DE
- option state shackspace
- option location shackspace
-
- option commonname krebs-rickroller
diff --git a/minikrebs/profiles/rickroller/customfiles/etc/uhttpd.crt b/minikrebs/profiles/rickroller/customfiles/etc/uhttpd.crt
new file mode 100644
index 00000000..d406c90f
--- /dev/null
+++ b/minikrebs/profiles/rickroller/customfiles/etc/uhttpd.crt
Binary files differ
diff --git a/minikrebs/profiles/rickroller/customfiles/etc/uhttpd.key b/minikrebs/profiles/rickroller/customfiles/etc/uhttpd.key
new file mode 100644
index 00000000..d5d163d2
--- /dev/null
+++ b/minikrebs/profiles/rickroller/customfiles/etc/uhttpd.key
Binary files differ